diff --git a/LoginCapture/AUTHORS b/LoginCapture/AUTHORS
deleted file mode 100644
index e69de29b..00000000
diff --git a/LoginCapture/ChangeLog b/LoginCapture/ChangeLog
deleted file mode 100644
index e69de29b..00000000
diff --git a/LoginCapture/Makefile.am b/LoginCapture/Makefile.am
deleted file mode 100644
index a348e222..00000000
--- a/LoginCapture/Makefile.am
+++ /dev/null
@@ -1,46 +0,0 @@
-#######################################################################
-#
-#  Copyright (C) 2004 Novell, Inc.
-#
-#  This program is free software; you can redistribute it and/or
-#  modify it under the terms of the GNU General Public
-#  License as published by the Free Software Foundation; either
-#  version 2 of the License, or (at your option) any later version.
-#
-#  This program is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-#  General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public
-#  License along with this program; if not, write to the Free
-#  Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-#
-#  Author: Juan Carlos Luciani <jluciani@novell.com>
-#
-#######################################################################
-
-SUBDIRS = $(TARGET_OS) package
-
-DIST_SUBDIRS = linux windows package
-
-EXTRA_DIST =
-
-.PHONY: package package-clean package-install package-uninstall
-package package-clean package-install package-uninstall:
-	$(MAKE) -C package $@
-
-installcheck-summary:
-	$(MAKE) -C src $@
-
-clean-local:
-	rm -rf *.suo
-	
-maintainer-clean-local:
-	rm -f configure Makefile.in logincapture-*.tar.gz
-	rm -f aclocal.m4 conf*.sh configure.lineno
-	rm -f config.guess config.sub config.status
-	rm -f ltmain.sh libtool
-	rm -f install-sh install-sh.lnk INSTALL INSTALL.lnk
-	rm -f missing missing.lnk mkinstalldirs mkinstalldir.lnk
-	rm -rf autom4te.cache
diff --git a/LoginCapture/NEWS b/LoginCapture/NEWS
deleted file mode 100644
index e69de29b..00000000
diff --git a/LoginCapture/autogen.sh b/LoginCapture/autogen.sh
deleted file mode 100644
index 7b4b68f9..00000000
--- a/LoginCapture/autogen.sh
+++ /dev/null
@@ -1,130 +0,0 @@
-#!/bin/sh
-# Run this to generate all the initial makefiles, etc.
-
-srcdir=`dirname $0`
-test -z "$srcdir" && srcdir=.
-
-ORIGDIR=`pwd`
-cd $srcdir
-PROJECT=LoginCapture
-TEST_TYPE=-f
-FILE=linux/pam_pwcapture.c
-
-DIE=0
-
-(autoconf --version) < /dev/null > /dev/null 2>&1 || {
-	echo
-	echo "You must have autoconf installed to compile $PROJECT."
-	echo "Download the appropriate package for your distribution,"
-	echo "or get the source tarball at ftp://ftp.gnu.org/pub/gnu/"
-	DIE=1
-}
-
-AUTOMAKE=automake-1.7
-ACLOCAL=aclocal-1.7
-
-($AUTOMAKE --version) < /dev/null > /dev/null 2>&1 || {
-        AUTOMAKE=automake
-        ACLOCAL=aclocal
-}
-
-($AUTOMAKE --version) < /dev/null > /dev/null 2>&1 || {
-	echo
-	echo "You must have automake installed to compile $PROJECT."
-	echo "Download the appropriate package for your distribution,"
-	echo "or get the source tarball at ftp://ftp.gnu.org/pub/gnu/"
-	DIE=1
-}
-
-if test "$DIE" -eq 1; then
-	exit 1
-fi
-
-test $TEST_TYPE $FILE || {
-	echo "You must run this script in the top-level $PROJECT directory"
-	exit 1
-}
-
-if test -z "$*"; then
-	echo "I am going to run ./configure with no arguments - if you wish "
-        echo "to pass any to it, please specify them on the $0 command line."
-fi
-
-case $CC in
-*xlc | *xlc\ * | *lcc | *lcc\ *) am_opt=--include-deps;;
-esac
-
-for coin in `find $srcdir -name configure.in -print`
-do
-  dr=`dirname $coin`
-  if test -f $dr/NO-AUTO-GEN; then
-    echo skipping $dr -- flagged as no auto-gen
-  else
-    echo processing $dr
-    macrodirs=`sed -n -e 's,AM_ACLOCAL_INCLUDE(\(.*\)),\1,gp' < $coin`
-    ( cd $dr
-      aclocalinclude="$ACLOCAL_FLAGS"
-      for k in $macrodirs; do
-  	if test -d $k; then
-          aclocalinclude="$aclocalinclude -I $k"
-  	##else
-	##  echo "**Warning**: No such directory \`$k'.  Ignored."
-        fi
-      done
-      if grep "^AM_GNU_GETTEXT" configure.in >/dev/null; then
-	if grep "sed.*POTFILES" configure.in >/dev/null; then
-	  : do nothing -- we still have an old unmodified configure.in
-	else
-	  echo "Creating $dr/aclocal.m4 ..."
-	  test -r $dr/aclocal.m4 || touch $dr/aclocal.m4
-	  echo "Running gettextize...  Ignore non-fatal messages."
-	  echo "no" | gettextize --force --copy
-	  echo "Making $dr/aclocal.m4 writable ..."
-	  test -r $dr/aclocal.m4 && chmod u+w $dr/aclocal.m4
-        fi
-      fi
-      if grep "^AM_GNOME_GETTEXT" configure.in >/dev/null; then
-	echo "Creating $dr/aclocal.m4 ..."
-	test -r $dr/aclocal.m4 || touch $dr/aclocal.m4
-	echo "Running gettextize...  Ignore non-fatal messages."
-	echo "no" | gettextize --force --copy
-	echo "Making $dr/aclocal.m4 writable ..."
-	test -r $dr/aclocal.m4 && chmod u+w $dr/aclocal.m4
-      fi
-      if grep "^AM_GLIB_GNU_GETTEXT" configure.in >/dev/null; then
-	echo "Creating $dr/aclocal.m4 ..."
-	test -r $dr/aclocal.m4 || touch $dr/aclocal.m4
-	echo "Running gettextize...  Ignore non-fatal messages."
-	echo "no" | glib-gettextize --force --copy
-	echo "Making $dr/aclocal.m4 writable ..."
-	test -r $dr/aclocal.m4 && chmod u+w $dr/aclocal.m4
-      fi
-      if grep "^AM_PROG_LIBTOOL" configure.in >/dev/null; then
-	echo "Running libtoolize..."
-	libtoolize --force --copy
-      fi
-      echo "Running $ACLOCAL $aclocalinclude ..."
-      $ACLOCAL $aclocalinclude
-      if grep "^AM_CONFIG_HEADER" configure.in >/dev/null; then
-	echo "Running autoheader..."
-	autoheader
-      fi
-      echo "Running $AUTOMAKE --gnu $am_opt ..."
-      $AUTOMAKE --add-missing --gnu $am_opt
-      echo "Running autoconf ..."
-      autoconf
-    )
-  fi
-done
-
-conf_flags="--config-cache --enable-maintainer-mode --enable-compile-warnings" #--enable-iso-c
-
-cd "$ORIGDIR"
-
-if test x$NOCONFIGURE = x; then
-  echo Running $srcdir/configure $conf_flags "$@" ...
-  $srcdir/configure $conf_flags "$@" \
-  && echo Now type \`make\' to compile $PROJECT  || exit 1
-else
-  echo Skipping configure process.
-fi
diff --git a/LoginCapture/configure.in b/LoginCapture/configure.in
deleted file mode 100644
index bc94b1f7..00000000
--- a/LoginCapture/configure.in
+++ /dev/null
@@ -1,203 +0,0 @@
-#######################################################################
-#
-#  Copyright (C) 2004 Novell, Inc.
-#
-#  This program is free software; you can redistribute it and/or
-#  modify it under the terms of the GNU General Public
-#  License as published by the Free Software Foundation; either
-#  version 2 of the License, or (at your option) any later version.
-#
-#  This program is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-#  General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public
-#  License along with this program; if not, write to the Free
-#  Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-#
-#  Author: Juan Carlos Luciani <jluciani@novell.com>
-#
-#######################################################################
-
-AC_INIT(linux/pam_pwcapture.c)
-AC_CANONICAL_SYSTEM
-AM_INIT_AUTOMAKE(logincapture, 0.1.1)
-RELEASE=`date +%Y%m%d_%H%M`
-AC_SUBST(RELEASE)
-AM_MAINTAINER_MODE
-
-#
-# Check for a valid C# compiler
-#
-AC_CHECK_PROG(CSC, csc, csc)
-test -z "$CSC" && AC_CHECK_PROG(CSC, mcs, mcs)
-test -z "$CSC" && AC_MSG_ERROR([no acceptable C Sharp compiler found in \$PATH])
-
-case $CSC in
-    #
-    # Mono-specific configuration
-    #
-    mcs)
-        CSC_EXEFLAG=/target:exe
-        CSC_LIBFLAG=/target:library
-        CSC_EXEFLAG=/target:exe
-        CSC_WINEXEFLAG=/target:winexe
-        CSCFLAGS='/d:MONO /warn:4 /d:TRACE'
-        CSCFLAGS_DEBUG="/debug+ /d:DEBUG"
-        CSCFLAGS_OPTIMIZE="/optimize+"
-        MONO=mono
-        MONO_DEBUG='mono --debug'
-        MONO_PATH=
-        SYSTEM_XML='System.Xml.dll'
-    ;;
-    #
-    # .NET-specific configuration
-    #
-    csc)
-        CSC_EXEFLAG=/target:exe
-        CSC_LIBFLAG=/target:library
-        CSC_EXEFLAG=/target:exe
-        CSC_WINEXEFLAG=/target:winexe
-        CSCFLAGS='/d:DOTNET /warn:4 /d:TRACE /nologo'
-        CSCFLAGS_DEBUG="/debug+ /d:DEBUG"
-        CSCFLAGS_OPTIMIZE="/optimize+"
-        MONO=
-        MONO_DEBUG=
-        MONO_PATH=
-        SYSTEM_XML='System.XML.dll'
-    ;;
-esac
-AC_SUBST(CSC)
-AC_SUBST(CSC_EXEFLAG)
-AC_SUBST(CSC_LIBFLAG)
-AC_SUBST(CSC_WINEXEFLAG)
-AC_SUBST(CSCFLAGS)
-AC_SUBST(MONO)
-AC_SUBST(MONO_PATH)
-AC_SUBST(SYSTEM_XML)
-
-SRCDIR='$(top_srcdir)'
-DOCDIR="$SRCDIR/doc"
-
-AC_SUBST(SRCDIR)
-AC_SUBST(DOCDIR)
-
-EMPTY=
-SPACE='$(EMPTY) $(EMPTY)'
-
-AC_SUBST(EMPTY)
-AC_SUBST(SPACE)
-
-#
-# Check for a valid operating system
-#
-case $host_os in
-    linux*)
-        TARGET_OS='linux'
-    ;;
-    cygwin*)
-        TARGET_OS='windows'
-    ;;
-    *)
-        AC_MSG_ERROR([Unknown host_os: $host_os])
-    ;;
-esac
-AC_SUBST(TARGET_OS)
-AM_CONDITIONAL(LINUX, test "$TARGET_OS" = "linux")
-AM_CONDITIONAL(WINDOWS, test "$TARGET_OS" = "windows")
-
-#
-# Set platform-specific variables
-#
-case $TARGET_OS in
-    #
-    # Linux-specific configuration
-    #
-    linux)
-        #
-        # Set variables
-        #
-        COMMON_CLEAN_FILES=''
-        ICON_EXT='.ico'
-        ICON_FLAG='/resource:'
-        PLATFORM_SUBDIRS=$LINUX_SUBDIRS
-        SEP='/'
-    ;;
-    #
-    # Windows-specific configuration
-    #
-    windows)
-        COMMON_CLEAN_FILES='*.suo */*.suo *.csproj.user */*.csproj.user bin obj */bin */obj *.xml */*.xml *.pdb */*.pdb'
-        ICON_EXT='.ico'
-        ICON_FLAG='/win32icon:'
-        PLATFORM_SUBDIRS=$WINDOWS_SUBDIRS
-        SEP='$(EMPTY)\\$(EMPTY)'
-    ;;
-esac
-AC_SUBST(COMMON_CLEAN_FILES)
-AC_SUBST(ICON_EXT)
-AC_SUBST(ICON_FLAG)
-AC_SUBST(PLATFORM_SUBDIRS)
-AC_SUBST(SEP)
-
-#
-# Run standard macros
-#
-AM_PROG_CC_STDC
-AC_PROG_INSTALL
-AC_HEADER_STDC
-
-#
-# Handle --enable-debug
-#
-AC_ARG_ENABLE(debug, [
-  --enable-debug          configure the Makefiles to build in DEBUG mode],
-    [case "${enableval}" in
-        yes) enable_debug=true ;;
-        no)  enable_debug=false ;;
-        *) AC_MSG_ERROR(bad value ${enableval} for --enable-debug) ;;
-    esac],[enable_debug=false])
-AM_CONDITIONAL(DEBUG, test x$enable_debug = xtrue)
-if test "$enable_debug" = "true"
-then
-  # Build debug version.
-  CFLAGS="$CFLAGS_DEBUG $CFLAGS"
-  CSCFLAGS="$CSCFLAGS_DEBUG $CSCFLAGS"
-  CXXFLAGS="$CXXFLAGS_DEBUG $CXXFLAGS"
-  DEVENV_CONFIGURATION=Debug
-  MONO=$MONO_DEBUG
-else
-  # Build optimized version.
-  CFLAGS="$CFLAGS_OPTIMIZE $CFLAGS"
-  CSCFLAGS="$CSCFLAGS_OPTIMIZE $CSCFLAGS"
-  CXXFLAGS="$CXXFLAGS_OPTIMIZE $CXXFLAGS"
-  DEVENV_CONFIGURATION=Release
-fi
-AC_SUBST(CSCFLAGS)
-AC_SUBST(DEVENV_CONFIGURATION)
-
-#
-# Configure PKG_CONFIG
-#
-AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
-if test "x$PKG_CONFIG" = "xno"; then
-	AC_MSG_ERROR([You need to install pkg-config])
-fi
-
-#
-# Configure files
-#
-AC_OUTPUT([
-Makefile
-linux/Makefile
-linux/install/Makefile
-windows/Makefile
-package/windows/Makefile
-package/windows/logincapture-msm/Makefile
-package/Makefile
-package/linux/Makefile
-package/linux/logincapture.spec
-])
-
-
diff --git a/LoginCapture/LoginCapture.ncb b/LoginCapture/windows/LoginCapture.ncb
similarity index 100%
rename from LoginCapture/LoginCapture.ncb
rename to LoginCapture/windows/LoginCapture.ncb
diff --git a/LoginCapture/LoginCapture.sln b/LoginCapture/windows/LoginCapture.sln
similarity index 100%
rename from LoginCapture/LoginCapture.sln
rename to LoginCapture/windows/LoginCapture.sln
diff --git a/LoginCapture/LoginCapture.suo b/LoginCapture/windows/LoginCapture.suo
similarity index 100%
rename from LoginCapture/LoginCapture.suo
rename to LoginCapture/windows/LoginCapture.suo
diff --git a/LoginCapture/README b/LoginCapture/windows/README
similarity index 100%
rename from LoginCapture/README
rename to LoginCapture/windows/README
diff --git a/login_capture/Makefile.am b/login_capture/linux/Makefile.am
similarity index 100%
rename from login_capture/Makefile.am
rename to login_capture/linux/Makefile.am
diff --git a/login_capture/PAM/Makefile.am b/login_capture/linux/PAM/Makefile.am
similarity index 100%
rename from login_capture/PAM/Makefile.am
rename to login_capture/linux/PAM/Makefile.am
diff --git a/login_capture/PAM/linux/Makefile.am b/login_capture/linux/PAM/linux/Makefile.am
similarity index 100%
rename from login_capture/PAM/linux/Makefile.am
rename to login_capture/linux/PAM/linux/Makefile.am
diff --git a/login_capture/PAM/linux/link.lux b/login_capture/linux/PAM/linux/link.lux
similarity index 100%
rename from login_capture/PAM/linux/link.lux
rename to login_capture/linux/PAM/linux/link.lux
diff --git a/login_capture/PAM/linux/objs.lux b/login_capture/linux/PAM/linux/objs.lux
similarity index 100%
rename from login_capture/PAM/linux/objs.lux
rename to login_capture/linux/PAM/linux/objs.lux
diff --git a/login_capture/PAM/linux/pam_csss_lux.exp b/login_capture/linux/PAM/linux/pam_csss_lux.exp
similarity index 100%
rename from login_capture/PAM/linux/pam_csss_lux.exp
rename to login_capture/linux/PAM/linux/pam_csss_lux.exp
diff --git a/login_capture/PAM/linux/pam_micasa_lux.exp b/login_capture/linux/PAM/linux/pam_micasa_lux.exp
similarity index 100%
rename from login_capture/PAM/linux/pam_micasa_lux.exp
rename to login_capture/linux/PAM/linux/pam_micasa_lux.exp
diff --git a/login_capture/PAM/pam_sscs.c b/login_capture/linux/PAM/pam_sscs.c
similarity index 100%
rename from login_capture/PAM/pam_sscs.c
rename to login_capture/linux/PAM/pam_sscs.c
diff --git a/login_capture/PAM/pam_sscs.h b/login_capture/linux/PAM/pam_sscs.h
similarity index 100%
rename from login_capture/PAM/pam_sscs.h
rename to login_capture/linux/PAM/pam_sscs.h
diff --git a/login_capture/PAM/pam_sscs_utils.c b/login_capture/linux/PAM/pam_sscs_utils.c
similarity index 100%
rename from login_capture/PAM/pam_sscs_utils.c
rename to login_capture/linux/PAM/pam_sscs_utils.c