diff --git a/CASA-auth-token/AUTHORS b/CASA-auth-token/AUTHORS
new file mode 100644
index 00000000..e69de29b
diff --git a/CASA-auth-token/ChangeLog b/CASA-auth-token/ChangeLog
new file mode 100644
index 00000000..e69de29b
diff --git a/CASA-auth-token/NEWS b/CASA-auth-token/NEWS
new file mode 100644
index 00000000..e69de29b
diff --git a/CASA-auth-token/autogen.sh b/CASA-auth-token/autogen.sh
new file mode 100755
index 00000000..c9293b55
--- /dev/null
+++ b/CASA-auth-token/autogen.sh
@@ -0,0 +1,130 @@
+#!/bin/sh
+# Run this to generate all the initial makefiles, etc.
+
+srcdir=`dirname $0`
+test -z "$srcdir" && srcdir=.
+
+ORIGDIR=`pwd`
+cd $srcdir
+PROJECT=CASA
+TEST_TYPE=-f
+FILE=include/micasa.h
+
+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.9
+ACLOCAL=aclocal-1.9
+
+($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/CASA-auth-token/configure.in b/CASA-auth-token/configure.in
new file mode 100644
index 00000000..53fc6ffe
--- /dev/null
+++ b/CASA-auth-token/configure.in
@@ -0,0 +1,278 @@
+#######################################################################
+#
+#  Copyright (C) 2006 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.
+#
+#
+#######################################################################
+
+AC_INIT(client/internal.h)
+AC_CANONICAL_SYSTEM
+AM_INIT_AUTOMAKE(CASA-auth-token, 1.7.678)
+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])
+
+#
+# Check for valid C# compiler in linux
+#
+case $host_os in
+    cygwin*)
+    ;;
+    *)
+        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])
+
+    ;;
+esac
+
+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 -d:LINUX'
+        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(CSCFLAGS_DEBUG)
+AC_SUBST(MONO)
+AC_SUBST(MONO_PATH)
+AC_SUBST(SYSTEM_XML)
+
+SRCDIR='$(top_srcdir)'
+DOCDIR="$SRCDIR/doc"
+TOOLDIR='$(top_srcdir)/tools'
+AC_SUBST(SRCDIR)
+AC_SUBST(DOCDIR)
+AC_SUBST(TOOLDIR)
+EMPTY=
+SPACE='$(EMPTY) $(EMPTY)'
+
+AC_SUBST(EMPTY)
+AC_SUBST(SPACE)
+
+#
+# Check for operating system and set TARGET_OS 
+#
+case $host_os in
+    cygwin*)
+        TARGET_OS='windows'
+    ;;
+    *)
+	TARGET_OS='linux'
+    ;;
+esac
+
+AC_SUBST(TARGET_OS)
+AM_CONDITIONAL(LINUX, test "$TARGET_OS" = "linux")
+AM_CONDITIONAL(WINDOWS, test "$TARGET_OS" = "windows")
+
+#
+# Check for architecture and set TARGET_ARCH
+# ia64 needs to be treated as non64.
+
+case $target_cpu in
+    x86_64|p*pc64|s390x)
+        LIB=lib64
+    ;;
+    *ia64|*)
+        LIB=lib
+    ;;
+esac
+
+AC_SUBST(LIB)
+AM_CONDITIONAL(LIB64, test "$LIB" = lib64)
+
+#
+#
+# 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='/'
+	LINK=gcc
+    ;;
+    #
+    # 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)'
+	LINK=link.exe
+    ;;
+esac
+AC_SUBST(COMMON_CLEAN_FILES)
+AC_SUBST(ICON_EXT)
+AC_SUBST(ICON_FLAG)
+AC_SUBST(PLATFORM_SUBDIRS)
+AC_SUBST(SEP)
+AC_SUBST(LINK)
+
+#
+# Run standard macros
+#
+AM_PROG_CC_STDC
+AC_PROG_INSTALL
+AC_HEADER_STDC
+
+#######
+#
+# set CFLAGS
+#
+case $host_os in
+   linux*)
+    CFLAGS="$CFLAGS"
+   ;;
+   cygwin*)
+   CC=cl.exe
+   CFLAGS="-D WIN32 -D SSCS_WIN32_PLAT_F -D N_PLAT_CLIENT -MT -Ox"
+   ;;
+esac
+
+#
+# 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 -DDBG -DDEBUG"
+  CFLAGS="$CFLAGS_DEBUG $CFLAGS -g -DDBG -DDEBUG \
+-fPIC -DPIC -DSSCS_LINUX_PLAT_F -O2 -fmessage-length=0 -Wall \
+-D_REENTRANT -DALIGNMENT -DN_PLAT_UNIX \
+-DUNIX -DLINUX -DIAPX38"
+  CSCFLAGS="$CSCFLAGS_DEBUG $CSCFLAGS"
+  CXXFLAGS="$CXXFLAGS_DEBUG $CXXFLAGS"
+  DEVENV_CONFIGURATION=Debug
+  MONO=$MONO_DEBUG
+else
+  # Build optimized version.
+  CFLAGS="$CFLAGS_OPTIMIZE $CFLAGS -g -fPIC -DPIC \
+-DSSCS_LINUX_PLAT_F -O2 -fmessage-length=0 -Wall \
+-D_REENTRANT -DALIGNMENT -DN_PLAT_UNIX \
+-DUNIX -DLINUX -DIAPX38"
+  CSCFLAGS="$CSCFLAGS_OPTIMIZE $CSCFLAGS"
+  CXXFLAGS="$CXXFLAGS_OPTIMIZE $CXXFLAGS"
+  DEVENV_CONFIGURATION=Release
+fi
+AC_SUBST(CSCFLAGS)
+AC_SUBST(DEVENV_CONFIGURATION)
+
+##comment out due to build failure
+# Check for GCC version to add fstack-protector flag
+#
+#GCC_VER="`gcc -dumpversion`"
+#case "$GCC_VER" in
+#        3*)
+#	;;
+#        4*)
+#        CFLAGS="$CFLAGS -fstack-protector"
+#	;;
+#        *)
+#        ;;
+#esac
+                                                                                                              
+AC_SUBST(GCC_VER)
+
+#
+# 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
+auth_token/Makefile
+auth_token/server/Makefile
+auth_token/server/AuthTokenValidate/Makefile
+auth_token/server/AuthTokenValidate/linux/Makefile
+auth_token/server/AuthTokenValidate/idenTokenProviders/Makefile
+auth_token/server/AuthTokenValidate/idenTokenProviders/casa/Makefile
+auth_token/server/AuthTokenValidate/idenTokenProviders/casa/linux/Makefile
+auth_token/server/PamSupport/Makefile
+auth_token/server/PamSupport/linux/Makefile
+auth_token/server/ApacheSupport/Makefile
+auth_token/server/ApacheSupport/2.2/Makefile
+auth_token/server/ApacheSupport/2.2/linux/Makefile
+auth_token/server/AuthTokenSvc/Makefile
+auth_token/server/JaasSupport/Makefile
+])
+
diff --git a/CASA/Makefile.am b/CASA/Makefile.am
index e23fb98c..aa1d1480 100644
--- a/CASA/Makefile.am
+++ b/CASA/Makefile.am
@@ -26,16 +26,16 @@ TARGET_CFG = Release
 endif
 
 if LINUX
-SUBDIRS = c_micasacache c_common c_micasadk c_micasad/lib  c_sharp  \
-	c_policy c_adlib c_micasad c_gui login_capture c_jwrapper package
+SUBDIRS = micasacache common micasadk micasad/lib  sharp  \
+	policy adlib micasad gui logincapture jwrapper package
 
-DIST_SUBDIRS = c_micasacache c_common c_micasadk c_micasad c_sharp  \
-	c_policy c_adlib c_gui login_capture c_jwrapper package
+DIST_SUBDIRS = micasacache common micasadk micasad sharp  \
+	policy adlib gui logincapture jwrapper package
 endif
 
 if WINDOWS
-SUBDIRS = c_micasacache c_common c_micasadk c_jwrapper  package 
-DIST_SUBDIRS = c_micasacache c_common c_micasadk c_jwrapper  package
+SUBDIRS = micasacache common micasadk jwrapper  package 
+DIST_SUBDIRS = micasacache common micasadk jwrapper  package
 endif
 
 EXTRA_DIST = include include/*.h \
diff --git a/CASA/Readme.txt b/CASA/Readme.txt
deleted file mode 100644
index 772b03ef..00000000
--- a/CASA/Readme.txt
+++ /dev/null
@@ -1,53 +0,0 @@
-INSTRUCTIONS FOR SETTING UP YOUR BUILD ENVIRONMENT
-==================================================
-
-For Linux
-cd to top directory.
-./autogen.sh (for debug build, pass "--enable-debug")
-make  
-
-For Windows
-MAKE CLEAN ALL run sequence mk-ca-all for developers and mk-cai-all for BMs.
-for individual builds:
-for Windows cd shsrc/wshsrc and find
-the mk-XXX-tp that matches the module name and the type and the platform.
-xxx the module name
-types:
-dp d for debug
-op o for optimized
-tw Windows platform
-example:
-mk-nsssdk-ow optimzed for Windows
-
-command line form:
-mk-nsssdk-ow d clean all (d for developer - m for build manager)
-
-****************************************************************************************** 
-
-Complier has been upgraded to Microsoft VC 7. After installing the compiler and setting up
-parmaters as described above you need to copy the directory Vc7 under the compiler installation 
-into c:\tools or a directory that does not have any spaces in the name because cypgwin and
-gnumake have problems executing commands in paths with spaces in the names.
-
-Cameron Mashayekhi 2/14/2005
-
-****************************************************************************************** 
-
-
-For a clarification on the location of the compiler please read changes.log with the entry
-dated 3/9/05.
-
-Code changed from using wide chars (wchar_t) to UTF8.
-sscs_utfh8.h
-sscs_string.h
-was added.
-
-To support ISF architecture the nsscs_idk.h replaced nsscs_sdk.h and for the Managed APIs
-the header file nsscs_mgmd_idk.h was added.
-
-nsssdk has been renamed to nssidk.
-
-Cameron Mashayekhi 3/9/05.
-
-******************************************************************************************
-
diff --git a/CASA/Readme_for_Windows_Build.txt b/CASA/Readme_for_Windows_Build.txt
deleted file mode 100644
index c2518eff..00000000
--- a/CASA/Readme_for_Windows_Build.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-To build miCASA 1.5 for windows, do the following:
-
-1. Install Visual Studio.net
-2. Install Cygwin
-3. Run the mk-cai-all script for windows
-
-The Setup files will be found in the 'products' directory
\ No newline at end of file
diff --git a/CASA/Readme_for_the_project_and_setup.txt b/CASA/Readme_for_the_project_and_setup.txt
deleted file mode 100644
index 7b34075b..00000000
--- a/CASA/Readme_for_the_project_and_setup.txt
+++ /dev/null
@@ -1,138 +0,0 @@
-/***********************************************************************
- *  File: README
- * 
- *  Copyright (C) 2005 Novell, Inc.
- *
- *  This library 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 library 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
- *  Library General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public
- *  License along with this library; if not, write to the Free
- *  Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- ***********************************************************************/
-
-REQUIREMENTS FOR BUILDING THE SOFTWARE PACKAGE ON WINDOWS
-
-  - Install Visual Studio .NET 2003
-  - Install Cygwin - See instructions below.
-
-Download and start cygwin install:
-Browse to http://sources.redhat.com/cygwin/ 
-
-Click on "Install or update now!" or "Install Cygwin now"
-
-Cygwin Setup:
-Next
-
-Cygwin Setup - Choose Installation Type:
-Install from Internet
-Next
-
-Cygwin Setup - Choose Installation Directory:
-Root Directory: C:\cygwin
-Install For:  "All Users"
-
-Default Text File Type: DOS
-
-Cygwin Setup - Select Local Package Directory:
-  Local Package Directory: C:\cygwin-packages
-
-Cygwin Setup - Select Connection Type:
-  Direct Connection
-
-Choose A Download Site:
-  ftp://ftp.nas.nasa.gov 
-
-Cywin Setup - Select Packages:
-  Base:
-    defaults
-
-  Devel:
-    autoconf
-    automake
-    libtool
-    make
-    pkgconfig
-    cvs
-    gcc
-    gcc-g++
-
-  Editors:
-    vim (optional)
-
-  Net:
-    openssh
-    openssl
-
-  Text:
-    more
-
-  Utils:
-    clear (optional)
-
-Cygwin Setup - Create Icons:
-Finish
-
-Download the latest Jave JRE and J2EE from "http://java.sun.com"
-and install them on the machine.
-
-Edit cygwin.bat (c:\cygwin\cygwin.bat) to add a call to
-%VS71COMNTOOLS%\vsvars32.bat (see example below). Also
-add the MSCS and JAVA_HOME environment parameters to
-this file. This sets up the Visual Studio and Java tools 
-in Cygwin.
-
-Sample cygwin.bat:
-
-@echo off
-
-call "%VS71COMNTOOLS%\vsvars32.bat" > NUL
-@set "MSCS=c:/WINDOWS/Microsoft.NET/Framework/%
-@set "JAVA_HOME=c:/Sun/AppServer/jdk"
-
-C:
-chdir C:\cygwin\bin
-
-bash --login -i
-
-To build run mk-ca-all or mk-cai-all scripts that will build all of the 
-modules for debug and optimized.
-
-
-REQUIREMENTS FOR BUILDING THE SOFTWARE PACKAGE ON LINUX
-
-Install latest mono and mono-devel RPM - Obtain RPMs from
-www.go-mono.org.
-
-
-BUILDING THE SOFTWARE PACKAGE
-
-Windows:  Start at Step 1.
-Linux:  Skip to Step 2.
-
-1. Run cygwin.bat to start up Cygwin.
-
-2. Generate autotools files:
-./autogen.sh --prefix=/<install_dir>  [--enable-debug]
-(<install_dir> is some writable directory where 'make install' will
-install files for testing.
-
-3. To reconfigure later, or to configure software that came from a source
-distribution (.tar.gz) file, use configure.
-./configure --prefix/<install_dir> [--enable-debug]
-(run ./configure --help for more options)
-
-4. Select your make target, here are a few interesting ones:
-make
-
-All of the build scripts are under shsrc/lshsrc for Linux or
-shsrc/wshsrc for Windows.
-
- 
diff --git a/CASA/configure.in b/CASA/configure.in
index e4105507..730e1b64 100644
--- a/CASA/configure.in
+++ b/CASA/configure.in
@@ -21,7 +21,7 @@
 
 AC_INIT(include/micasa.h)
 AC_CANONICAL_SYSTEM
-AM_INIT_AUTOMAKE(CASA, 1.7.678787878787878)
+AM_INIT_AUTOMAKE(CASA, 1.7.678)
 RELEASE=`date +%Y%m%d_%H%M`
 AC_SUBST(RELEASE)
 AM_MAINTAINER_MODE
@@ -260,54 +260,40 @@ fi
 #
 AC_OUTPUT([
 Makefile
-auth_token/Makefile
-auth_token/server/Makefile
-auth_token/server/AuthTokenValidate/Makefile
-auth_token/server/AuthTokenValidate/linux/Makefile
-auth_token/server/AuthTokenValidate/idenTokenProviders/Makefile
-auth_token/server/AuthTokenValidate/idenTokenProviders/casa/Makefile
-auth_token/server/AuthTokenValidate/idenTokenProviders/casa/linux/Makefile
-auth_token/server/PamSupport/Makefile
-auth_token/server/PamSupport/linux/Makefile
-auth_token/server/ApacheSupport/Makefile
-auth_token/server/ApacheSupport/2.2/Makefile
-auth_token/server/ApacheSupport/2.2/linux/Makefile
-auth_token/server/AuthTokenSvc/Makefile
-auth_token/server/JaasSupport/Makefile
-c_micasacache/Makefile
-c_micasacache/linux/Makefile
-c_micasacache/windows/Makefile
-c_common/Makefile
-c_common/linux/Makefile
-c_common/windows/Makefile
-c_micasadk/Makefile
-c_micasadk/linux/Makefile
-c_micasadk/windows/Makefile
-c_micasad/lib/Makefile
-c_micasad/lib/common/Makefile
-c_micasad/lib/communication/Makefile
-c_micasad/startup/Makefile
-c_sharp/Makefile
-c_sharp/NSSCSWrapper/Makefile
-c_micasad/Makefile
-c_policy/Makefile
-c_adlib/ad_kw/Makefile
-c_adlib/ad_gk/native/Makefile
-c_adlib/ad_gk/Makefile
-c_adlib/ad_ff/native/Makefile
-c_adlib/ad_ff/Makefile
-c_adlib/Makefile
-c_gui/Makefile
-login_capture/Makefile
-login_capture/linux/Makefile
-login_capture/windows/Makefile
-login_capture/linux/PAM/Makefile
-login_capture/linux/PAM/linux/Makefile
-c_jwrapper/Makefile
-c_jwrapper/src/Makefile
-c_jwrapper/jnsscs/Makefile
-c_jwrapper/jnsscs/linux/Makefile
-c_jwrapper/jnsscs/windows/Makefile
+micasacache/Makefile
+micasacache/linux/Makefile
+micasacache/windows/Makefile
+common/Makefile
+common/linux/Makefile
+common/windows/Makefile
+micasadk/Makefile
+micasadk/linux/Makefile
+micasadk/windows/Makefile
+micasad/lib/Makefile
+micasad/lib/common/Makefile
+micasad/lib/communication/Makefile
+micasad/startup/Makefile
+sharp/Makefile
+sharp/NSSCSWrapper/Makefile
+micasad/Makefile
+policy/Makefile
+adlib/ad_kw/Makefile
+adlib/ad_gk/native/Makefile
+adlib/ad_gk/Makefile
+adlib/ad_ff/native/Makefile
+adlib/ad_ff/Makefile
+adlib/Makefile
+gui/Makefile
+logincapture/Makefile
+logincapture/linux/Makefile
+logincapture/windows/Makefile
+logincapture/linux/PAM/Makefile
+logincapture/linux/PAM/linux/Makefile
+jwrapper/Makefile
+jwrapper/src/Makefile
+jwrapper/jnsscs/Makefile
+jwrapper/jnsscs/linux/Makefile
+jwrapper/jnsscs/windows/Makefile
 package/Makefile
 package/linux/Makefile
 package/windows/Makefile
diff --git a/CASA/LoginCapture/Makefile.am b/CASA/logincapture/Makefile.am
similarity index 100%
rename from CASA/LoginCapture/Makefile.am
rename to CASA/logincapture/Makefile.am
diff --git a/CASA/LoginCapture/windows/README b/CASA/logincapture/README
similarity index 100%
rename from CASA/LoginCapture/windows/README
rename to CASA/logincapture/README
diff --git a/CASA/LoginCapture/linux/Makefile.am b/CASA/logincapture/linux/Makefile.am
similarity index 100%
rename from CASA/LoginCapture/linux/Makefile.am
rename to CASA/logincapture/linux/Makefile.am
diff --git a/CASA/LoginCapture/linux/PAM/Makefile.am b/CASA/logincapture/linux/PAM/Makefile.am
similarity index 100%
rename from CASA/LoginCapture/linux/PAM/Makefile.am
rename to CASA/logincapture/linux/PAM/Makefile.am
diff --git a/CASA/LoginCapture/linux/PAM/linux/Makefile.am b/CASA/logincapture/linux/PAM/linux/Makefile.am
similarity index 100%
rename from CASA/LoginCapture/linux/PAM/linux/Makefile.am
rename to CASA/logincapture/linux/PAM/linux/Makefile.am
diff --git a/CASA/LoginCapture/linux/PAM/linux/link.lux b/CASA/logincapture/linux/PAM/linux/link.lux
similarity index 100%
rename from CASA/LoginCapture/linux/PAM/linux/link.lux
rename to CASA/logincapture/linux/PAM/linux/link.lux
diff --git a/CASA/LoginCapture/linux/PAM/linux/objs.lux b/CASA/logincapture/linux/PAM/linux/objs.lux
similarity index 100%
rename from CASA/LoginCapture/linux/PAM/linux/objs.lux
rename to CASA/logincapture/linux/PAM/linux/objs.lux
diff --git a/CASA/LoginCapture/linux/PAM/linux/pam_csss_lux.exp b/CASA/logincapture/linux/PAM/linux/pam_csss_lux.exp
similarity index 100%
rename from CASA/LoginCapture/linux/PAM/linux/pam_csss_lux.exp
rename to CASA/logincapture/linux/PAM/linux/pam_csss_lux.exp
diff --git a/CASA/LoginCapture/linux/PAM/linux/pam_micasa_lux.exp b/CASA/logincapture/linux/PAM/linux/pam_micasa_lux.exp
similarity index 100%
rename from CASA/LoginCapture/linux/PAM/linux/pam_micasa_lux.exp
rename to CASA/logincapture/linux/PAM/linux/pam_micasa_lux.exp
diff --git a/CASA/LoginCapture/linux/PAM/pam_sscs.c b/CASA/logincapture/linux/PAM/pam_sscs.c
similarity index 100%
rename from CASA/LoginCapture/linux/PAM/pam_sscs.c
rename to CASA/logincapture/linux/PAM/pam_sscs.c
diff --git a/CASA/LoginCapture/linux/PAM/pam_sscs.h b/CASA/logincapture/linux/PAM/pam_sscs.h
similarity index 100%
rename from CASA/LoginCapture/linux/PAM/pam_sscs.h
rename to CASA/logincapture/linux/PAM/pam_sscs.h
diff --git a/CASA/LoginCapture/linux/PAM/pam_sscs_utils.c b/CASA/logincapture/linux/PAM/pam_sscs_utils.c
similarity index 100%
rename from CASA/LoginCapture/linux/PAM/pam_sscs_utils.c
rename to CASA/logincapture/linux/PAM/pam_sscs_utils.c
diff --git a/CASA/LoginCapture/windows/LoginCapture.ncb b/CASA/logincapture/windows/LoginCapture.ncb
similarity index 100%
rename from CASA/LoginCapture/windows/LoginCapture.ncb
rename to CASA/logincapture/windows/LoginCapture.ncb
diff --git a/CASA/LoginCapture/windows/LoginCapture.sln b/CASA/logincapture/windows/LoginCapture.sln
similarity index 100%
rename from CASA/LoginCapture/windows/LoginCapture.sln
rename to CASA/logincapture/windows/LoginCapture.sln
diff --git a/CASA/LoginCapture/windows/LoginCapture.suo b/CASA/logincapture/windows/LoginCapture.suo
similarity index 100%
rename from CASA/LoginCapture/windows/LoginCapture.suo
rename to CASA/logincapture/windows/LoginCapture.suo
diff --git a/CASA/LoginCapture/windows/Makefile.am b/CASA/logincapture/windows/Makefile.am
similarity index 100%
rename from CASA/LoginCapture/windows/Makefile.am
rename to CASA/logincapture/windows/Makefile.am
diff --git a/CASA/README b/CASA/logincapture/windows/README
similarity index 100%
rename from CASA/README
rename to CASA/logincapture/windows/README
diff --git a/CASA/LoginCapture/windows/external/provider/include/nwlgext.h b/CASA/logincapture/windows/external/provider/include/nwlgext.h
similarity index 100%
rename from CASA/LoginCapture/windows/external/provider/include/nwlgext.h
rename to CASA/logincapture/windows/external/provider/include/nwlgext.h
diff --git a/CASA/LoginCapture/windows/external/provider/include/nwlogin.h b/CASA/logincapture/windows/external/provider/include/nwlogin.h
similarity index 100%
rename from CASA/LoginCapture/windows/external/provider/include/nwlogin.h
rename to CASA/logincapture/windows/external/provider/include/nwlogin.h
diff --git a/CASA/LoginCapture/windows/external/xplatapi/include/npackoff.h b/CASA/logincapture/windows/external/xplatapi/include/npackoff.h
similarity index 100%
rename from CASA/LoginCapture/windows/external/xplatapi/include/npackoff.h
rename to CASA/logincapture/windows/external/xplatapi/include/npackoff.h
diff --git a/CASA/LoginCapture/windows/external/xplatapi/include/npackon.h b/CASA/logincapture/windows/external/xplatapi/include/npackon.h
similarity index 100%
rename from CASA/LoginCapture/windows/external/xplatapi/include/npackon.h
rename to CASA/logincapture/windows/external/xplatapi/include/npackon.h
diff --git a/CASA/LoginCapture/windows/external/xplatapi/include/ntypes.h b/CASA/logincapture/windows/external/xplatapi/include/ntypes.h
similarity index 100%
rename from CASA/LoginCapture/windows/external/xplatapi/include/ntypes.h
rename to CASA/logincapture/windows/external/xplatapi/include/ntypes.h
diff --git a/CASA/LoginCapture/windows/external/xplatapi/include/ntypes.txt b/CASA/logincapture/windows/external/xplatapi/include/ntypes.txt
similarity index 100%
rename from CASA/LoginCapture/windows/external/xplatapi/include/ntypes.txt
rename to CASA/logincapture/windows/external/xplatapi/include/ntypes.txt
diff --git a/CASA/LoginCapture/windows/external/xplatapi/include/nunicode.h b/CASA/logincapture/windows/external/xplatapi/include/nunicode.h
similarity index 100%
rename from CASA/LoginCapture/windows/external/xplatapi/include/nunicode.h
rename to CASA/logincapture/windows/external/xplatapi/include/nunicode.h
diff --git a/CASA/LoginCapture/windows/external/xplatapi/include/nwacct.h b/CASA/logincapture/windows/external/xplatapi/include/nwacct.h
similarity index 100%
rename from CASA/LoginCapture/windows/external/xplatapi/include/nwacct.h
rename to CASA/logincapture/windows/external/xplatapi/include/nwacct.h
diff --git a/CASA/LoginCapture/windows/external/xplatapi/include/nwadevnt.h b/CASA/logincapture/windows/external/xplatapi/include/nwadevnt.h
similarity index 100%
rename from CASA/LoginCapture/windows/external/xplatapi/include/nwadevnt.h
rename to CASA/logincapture/windows/external/xplatapi/include/nwadevnt.h
diff --git a/CASA/LoginCapture/windows/external/xplatapi/include/nwafp.h b/CASA/logincapture/windows/external/xplatapi/include/nwafp.h
similarity index 100%
rename from CASA/LoginCapture/windows/external/xplatapi/include/nwafp.h
rename to CASA/logincapture/windows/external/xplatapi/include/nwafp.h
diff --git a/CASA/LoginCapture/windows/external/xplatapi/include/nwalias.h b/CASA/logincapture/windows/external/xplatapi/include/nwalias.h
similarity index 100%
rename from CASA/LoginCapture/windows/external/xplatapi/include/nwalias.h
rename to CASA/logincapture/windows/external/xplatapi/include/nwalias.h
diff --git a/CASA/LoginCapture/windows/external/xplatapi/include/nwapidef.h b/CASA/logincapture/windows/external/xplatapi/include/nwapidef.h
similarity index 100%
rename from CASA/LoginCapture/windows/external/xplatapi/include/nwapidef.h
rename to CASA/logincapture/windows/external/xplatapi/include/nwapidef.h
diff --git a/CASA/LoginCapture/windows/external/xplatapi/include/nwaudit.h b/CASA/logincapture/windows/external/xplatapi/include/nwaudit.h
similarity index 100%
rename from CASA/LoginCapture/windows/external/xplatapi/include/nwaudit.h
rename to CASA/logincapture/windows/external/xplatapi/include/nwaudit.h
diff --git a/CASA/LoginCapture/windows/external/xplatapi/include/nwbindry.h b/CASA/logincapture/windows/external/xplatapi/include/nwbindry.h
similarity index 100%
rename from CASA/LoginCapture/windows/external/xplatapi/include/nwbindry.h
rename to CASA/logincapture/windows/external/xplatapi/include/nwbindry.h
diff --git a/CASA/LoginCapture/windows/external/xplatapi/include/nwcaldef.h b/CASA/logincapture/windows/external/xplatapi/include/nwcaldef.h
similarity index 100%
rename from CASA/LoginCapture/windows/external/xplatapi/include/nwcaldef.h
rename to CASA/logincapture/windows/external/xplatapi/include/nwcaldef.h
diff --git a/CASA/LoginCapture/windows/external/xplatapi/include/nwcalls.h b/CASA/logincapture/windows/external/xplatapi/include/nwcalls.h
similarity index 100%
rename from CASA/LoginCapture/windows/external/xplatapi/include/nwcalls.h
rename to CASA/logincapture/windows/external/xplatapi/include/nwcalls.h
diff --git a/CASA/LoginCapture/windows/external/xplatapi/include/nwclxcon.h b/CASA/logincapture/windows/external/xplatapi/include/nwclxcon.h
similarity index 100%
rename from CASA/LoginCapture/windows/external/xplatapi/include/nwclxcon.h
rename to CASA/logincapture/windows/external/xplatapi/include/nwclxcon.h
diff --git a/CASA/LoginCapture/windows/external/xplatapi/include/nwconfig.h b/CASA/logincapture/windows/external/xplatapi/include/nwconfig.h
similarity index 100%
rename from CASA/LoginCapture/windows/external/xplatapi/include/nwconfig.h
rename to CASA/logincapture/windows/external/xplatapi/include/nwconfig.h
diff --git a/CASA/LoginCapture/windows/external/xplatapi/include/nwconnec.h b/CASA/logincapture/windows/external/xplatapi/include/nwconnec.h
similarity index 100%
rename from CASA/LoginCapture/windows/external/xplatapi/include/nwconnec.h
rename to CASA/logincapture/windows/external/xplatapi/include/nwconnec.h
diff --git a/CASA/LoginCapture/windows/external/xplatapi/include/nwdel.h b/CASA/logincapture/windows/external/xplatapi/include/nwdel.h
similarity index 100%
rename from CASA/LoginCapture/windows/external/xplatapi/include/nwdel.h
rename to CASA/logincapture/windows/external/xplatapi/include/nwdel.h
diff --git a/CASA/LoginCapture/windows/external/xplatapi/include/nwdentry.h b/CASA/logincapture/windows/external/xplatapi/include/nwdentry.h
similarity index 100%
rename from CASA/LoginCapture/windows/external/xplatapi/include/nwdentry.h
rename to CASA/logincapture/windows/external/xplatapi/include/nwdentry.h
diff --git a/CASA/LoginCapture/windows/external/xplatapi/include/nwdirect.h b/CASA/logincapture/windows/external/xplatapi/include/nwdirect.h
similarity index 100%
rename from CASA/LoginCapture/windows/external/xplatapi/include/nwdirect.h
rename to CASA/logincapture/windows/external/xplatapi/include/nwdirect.h
diff --git a/CASA/LoginCapture/windows/external/xplatapi/include/nwdpath.h b/CASA/logincapture/windows/external/xplatapi/include/nwdpath.h
similarity index 100%
rename from CASA/LoginCapture/windows/external/xplatapi/include/nwdpath.h
rename to CASA/logincapture/windows/external/xplatapi/include/nwdpath.h
diff --git a/CASA/LoginCapture/windows/external/xplatapi/include/nwdsacl.h b/CASA/logincapture/windows/external/xplatapi/include/nwdsacl.h
similarity index 100%
rename from CASA/LoginCapture/windows/external/xplatapi/include/nwdsacl.h
rename to CASA/logincapture/windows/external/xplatapi/include/nwdsacl.h
diff --git a/CASA/LoginCapture/windows/external/xplatapi/include/nwdsapi.h b/CASA/logincapture/windows/external/xplatapi/include/nwdsapi.h
similarity index 100%
rename from CASA/LoginCapture/windows/external/xplatapi/include/nwdsapi.h
rename to CASA/logincapture/windows/external/xplatapi/include/nwdsapi.h
diff --git a/CASA/LoginCapture/windows/external/xplatapi/include/nwdsasa.h b/CASA/logincapture/windows/external/xplatapi/include/nwdsasa.h
similarity index 100%
rename from CASA/LoginCapture/windows/external/xplatapi/include/nwdsasa.h
rename to CASA/logincapture/windows/external/xplatapi/include/nwdsasa.h
diff --git a/CASA/LoginCapture/windows/external/xplatapi/include/nwdsattr.h b/CASA/logincapture/windows/external/xplatapi/include/nwdsattr.h
similarity index 100%
rename from CASA/LoginCapture/windows/external/xplatapi/include/nwdsattr.h
rename to CASA/logincapture/windows/external/xplatapi/include/nwdsattr.h
diff --git a/CASA/LoginCapture/windows/external/xplatapi/include/nwdsaud.h b/CASA/logincapture/windows/external/xplatapi/include/nwdsaud.h
similarity index 100%
rename from CASA/LoginCapture/windows/external/xplatapi/include/nwdsaud.h
rename to CASA/logincapture/windows/external/xplatapi/include/nwdsaud.h
diff --git a/CASA/LoginCapture/windows/external/xplatapi/include/nwdsbuft.h b/CASA/logincapture/windows/external/xplatapi/include/nwdsbuft.h
similarity index 100%
rename from CASA/LoginCapture/windows/external/xplatapi/include/nwdsbuft.h
rename to CASA/logincapture/windows/external/xplatapi/include/nwdsbuft.h
diff --git a/CASA/LoginCapture/windows/external/xplatapi/include/nwdsconn.h b/CASA/logincapture/windows/external/xplatapi/include/nwdsconn.h
similarity index 100%
rename from CASA/LoginCapture/windows/external/xplatapi/include/nwdsconn.h
rename to CASA/logincapture/windows/external/xplatapi/include/nwdsconn.h
diff --git a/CASA/LoginCapture/windows/external/xplatapi/include/nwdsdc.h b/CASA/logincapture/windows/external/xplatapi/include/nwdsdc.h
similarity index 100%
rename from CASA/LoginCapture/windows/external/xplatapi/include/nwdsdc.h
rename to CASA/logincapture/windows/external/xplatapi/include/nwdsdc.h
diff --git a/CASA/LoginCapture/windows/external/xplatapi/include/nwdsdefs.h b/CASA/logincapture/windows/external/xplatapi/include/nwdsdefs.h
similarity index 100%
rename from CASA/LoginCapture/windows/external/xplatapi/include/nwdsdefs.h
rename to CASA/logincapture/windows/external/xplatapi/include/nwdsdefs.h
diff --git a/CASA/LoginCapture/windows/external/xplatapi/include/nwdsdsa.h b/CASA/logincapture/windows/external/xplatapi/include/nwdsdsa.h
similarity index 100%
rename from CASA/LoginCapture/windows/external/xplatapi/include/nwdsdsa.h
rename to CASA/logincapture/windows/external/xplatapi/include/nwdsdsa.h
diff --git a/CASA/LoginCapture/windows/external/xplatapi/include/nwdsevnt.h b/CASA/logincapture/windows/external/xplatapi/include/nwdsevnt.h
similarity index 100%
rename from CASA/LoginCapture/windows/external/xplatapi/include/nwdsevnt.h
rename to CASA/logincapture/windows/external/xplatapi/include/nwdsevnt.h
diff --git a/CASA/LoginCapture/windows/external/xplatapi/include/nwdsfilt.h b/CASA/logincapture/windows/external/xplatapi/include/nwdsfilt.h
similarity index 100%
rename from CASA/LoginCapture/windows/external/xplatapi/include/nwdsfilt.h
rename to CASA/logincapture/windows/external/xplatapi/include/nwdsfilt.h
diff --git a/CASA/LoginCapture/windows/external/xplatapi/include/nwdsmisc.h b/CASA/logincapture/windows/external/xplatapi/include/nwdsmisc.h
similarity index 100%
rename from CASA/LoginCapture/windows/external/xplatapi/include/nwdsmisc.h
rename to CASA/logincapture/windows/external/xplatapi/include/nwdsmisc.h
diff --git a/CASA/LoginCapture/windows/external/xplatapi/include/nwdsname.h b/CASA/logincapture/windows/external/xplatapi/include/nwdsname.h
similarity index 100%
rename from CASA/LoginCapture/windows/external/xplatapi/include/nwdsname.h
rename to CASA/logincapture/windows/external/xplatapi/include/nwdsname.h
diff --git a/CASA/LoginCapture/windows/external/xplatapi/include/nwdsnmtp.h b/CASA/logincapture/windows/external/xplatapi/include/nwdsnmtp.h
similarity index 100%
rename from CASA/LoginCapture/windows/external/xplatapi/include/nwdsnmtp.h
rename to CASA/logincapture/windows/external/xplatapi/include/nwdsnmtp.h
diff --git a/CASA/LoginCapture/windows/external/xplatapi/include/nwdspart.h b/CASA/logincapture/windows/external/xplatapi/include/nwdspart.h
similarity index 100%
rename from CASA/LoginCapture/windows/external/xplatapi/include/nwdspart.h
rename to CASA/logincapture/windows/external/xplatapi/include/nwdspart.h
diff --git a/CASA/LoginCapture/windows/external/xplatapi/include/nwdssch.h b/CASA/logincapture/windows/external/xplatapi/include/nwdssch.h
similarity index 100%
rename from CASA/LoginCapture/windows/external/xplatapi/include/nwdssch.h
rename to CASA/logincapture/windows/external/xplatapi/include/nwdssch.h
diff --git a/CASA/LoginCapture/windows/external/xplatapi/include/nwdstype.h b/CASA/logincapture/windows/external/xplatapi/include/nwdstype.h
similarity index 100%
rename from CASA/LoginCapture/windows/external/xplatapi/include/nwdstype.h
rename to CASA/logincapture/windows/external/xplatapi/include/nwdstype.h
diff --git a/CASA/LoginCapture/windows/external/xplatapi/include/nwea.h b/CASA/logincapture/windows/external/xplatapi/include/nwea.h
similarity index 100%
rename from CASA/LoginCapture/windows/external/xplatapi/include/nwea.h
rename to CASA/logincapture/windows/external/xplatapi/include/nwea.h
diff --git a/CASA/LoginCapture/windows/external/xplatapi/include/nwerror.h b/CASA/logincapture/windows/external/xplatapi/include/nwerror.h
similarity index 100%
rename from CASA/LoginCapture/windows/external/xplatapi/include/nwerror.h
rename to CASA/logincapture/windows/external/xplatapi/include/nwerror.h
diff --git a/CASA/LoginCapture/windows/external/xplatapi/include/nwfile.h b/CASA/logincapture/windows/external/xplatapi/include/nwfile.h
similarity index 100%
rename from CASA/LoginCapture/windows/external/xplatapi/include/nwfile.h
rename to CASA/logincapture/windows/external/xplatapi/include/nwfile.h
diff --git a/CASA/LoginCapture/windows/external/xplatapi/include/nwfse.h b/CASA/logincapture/windows/external/xplatapi/include/nwfse.h
similarity index 100%
rename from CASA/LoginCapture/windows/external/xplatapi/include/nwfse.h
rename to CASA/logincapture/windows/external/xplatapi/include/nwfse.h
diff --git a/CASA/LoginCapture/windows/external/xplatapi/include/nwitr.h b/CASA/logincapture/windows/external/xplatapi/include/nwitr.h
similarity index 100%
rename from CASA/LoginCapture/windows/external/xplatapi/include/nwitr.h
rename to CASA/logincapture/windows/external/xplatapi/include/nwitr.h
diff --git a/CASA/LoginCapture/windows/external/xplatapi/include/nwlocale.h b/CASA/logincapture/windows/external/xplatapi/include/nwlocale.h
similarity index 100%
rename from CASA/LoginCapture/windows/external/xplatapi/include/nwlocale.h
rename to CASA/logincapture/windows/external/xplatapi/include/nwlocale.h
diff --git a/CASA/LoginCapture/windows/external/xplatapi/include/nwmigrat.h b/CASA/logincapture/windows/external/xplatapi/include/nwmigrat.h
similarity index 100%
rename from CASA/LoginCapture/windows/external/xplatapi/include/nwmigrat.h
rename to CASA/logincapture/windows/external/xplatapi/include/nwmigrat.h
diff --git a/CASA/LoginCapture/windows/external/xplatapi/include/nwmisc.h b/CASA/logincapture/windows/external/xplatapi/include/nwmisc.h
similarity index 100%
rename from CASA/LoginCapture/windows/external/xplatapi/include/nwmisc.h
rename to CASA/logincapture/windows/external/xplatapi/include/nwmisc.h
diff --git a/CASA/LoginCapture/windows/external/xplatapi/include/nwmsg.h b/CASA/logincapture/windows/external/xplatapi/include/nwmsg.h
similarity index 100%
rename from CASA/LoginCapture/windows/external/xplatapi/include/nwmsg.h
rename to CASA/logincapture/windows/external/xplatapi/include/nwmsg.h
diff --git a/CASA/LoginCapture/windows/external/xplatapi/include/nwnamspc.h b/CASA/logincapture/windows/external/xplatapi/include/nwnamspc.h
similarity index 100%
rename from CASA/LoginCapture/windows/external/xplatapi/include/nwnamspc.h
rename to CASA/logincapture/windows/external/xplatapi/include/nwnamspc.h
diff --git a/CASA/LoginCapture/windows/external/xplatapi/include/nwncpext.h b/CASA/logincapture/windows/external/xplatapi/include/nwncpext.h
similarity index 100%
rename from CASA/LoginCapture/windows/external/xplatapi/include/nwncpext.h
rename to CASA/logincapture/windows/external/xplatapi/include/nwncpext.h
diff --git a/CASA/LoginCapture/windows/external/xplatapi/include/nwndscon.h b/CASA/logincapture/windows/external/xplatapi/include/nwndscon.h
similarity index 100%
rename from CASA/LoginCapture/windows/external/xplatapi/include/nwndscon.h
rename to CASA/logincapture/windows/external/xplatapi/include/nwndscon.h
diff --git a/CASA/LoginCapture/windows/external/xplatapi/include/nwnet.h b/CASA/logincapture/windows/external/xplatapi/include/nwnet.h
similarity index 100%
rename from CASA/LoginCapture/windows/external/xplatapi/include/nwnet.h
rename to CASA/logincapture/windows/external/xplatapi/include/nwnet.h
diff --git a/CASA/LoginCapture/windows/external/xplatapi/include/nwprint.h b/CASA/logincapture/windows/external/xplatapi/include/nwprint.h
similarity index 100%
rename from CASA/LoginCapture/windows/external/xplatapi/include/nwprint.h
rename to CASA/logincapture/windows/external/xplatapi/include/nwprint.h
diff --git a/CASA/LoginCapture/windows/external/xplatapi/include/nwqms.h b/CASA/logincapture/windows/external/xplatapi/include/nwqms.h
similarity index 100%
rename from CASA/LoginCapture/windows/external/xplatapi/include/nwqms.h
rename to CASA/logincapture/windows/external/xplatapi/include/nwqms.h
diff --git a/CASA/LoginCapture/windows/external/xplatapi/include/nwredir.h b/CASA/logincapture/windows/external/xplatapi/include/nwredir.h
similarity index 100%
rename from CASA/LoginCapture/windows/external/xplatapi/include/nwredir.h
rename to CASA/logincapture/windows/external/xplatapi/include/nwredir.h
diff --git a/CASA/LoginCapture/windows/external/xplatapi/include/nwserver.h b/CASA/logincapture/windows/external/xplatapi/include/nwserver.h
similarity index 100%
rename from CASA/LoginCapture/windows/external/xplatapi/include/nwserver.h
rename to CASA/logincapture/windows/external/xplatapi/include/nwserver.h
diff --git a/CASA/LoginCapture/windows/external/xplatapi/include/nwsm.h b/CASA/logincapture/windows/external/xplatapi/include/nwsm.h
similarity index 100%
rename from CASA/LoginCapture/windows/external/xplatapi/include/nwsm.h
rename to CASA/logincapture/windows/external/xplatapi/include/nwsm.h
diff --git a/CASA/LoginCapture/windows/external/xplatapi/include/nwssdefs.h b/CASA/logincapture/windows/external/xplatapi/include/nwssdefs.h
similarity index 100%
rename from CASA/LoginCapture/windows/external/xplatapi/include/nwssdefs.h
rename to CASA/logincapture/windows/external/xplatapi/include/nwssdefs.h
diff --git a/CASA/LoginCapture/windows/external/xplatapi/include/nwsync.h b/CASA/logincapture/windows/external/xplatapi/include/nwsync.h
similarity index 100%
rename from CASA/LoginCapture/windows/external/xplatapi/include/nwsync.h
rename to CASA/logincapture/windows/external/xplatapi/include/nwsync.h
diff --git a/CASA/LoginCapture/windows/external/xplatapi/include/nwtts.h b/CASA/logincapture/windows/external/xplatapi/include/nwtts.h
similarity index 100%
rename from CASA/LoginCapture/windows/external/xplatapi/include/nwtts.h
rename to CASA/logincapture/windows/external/xplatapi/include/nwtts.h
diff --git a/CASA/LoginCapture/windows/external/xplatapi/include/nwvol.h b/CASA/logincapture/windows/external/xplatapi/include/nwvol.h
similarity index 100%
rename from CASA/LoginCapture/windows/external/xplatapi/include/nwvol.h
rename to CASA/logincapture/windows/external/xplatapi/include/nwvol.h
diff --git a/CASA/LoginCapture/windows/external/xplatapi/include/unicode.h b/CASA/logincapture/windows/external/xplatapi/include/unicode.h
similarity index 100%
rename from CASA/LoginCapture/windows/external/xplatapi/include/unicode.h
rename to CASA/logincapture/windows/external/xplatapi/include/unicode.h
diff --git a/CASA/LoginCapture/windows/lcredmgr.cpp b/CASA/logincapture/windows/lcredmgr.cpp
similarity index 100%
rename from CASA/LoginCapture/windows/lcredmgr.cpp
rename to CASA/logincapture/windows/lcredmgr.cpp
diff --git a/CASA/LoginCapture/windows/lcredmgr.def b/CASA/logincapture/windows/lcredmgr.def
similarity index 100%
rename from CASA/LoginCapture/windows/lcredmgr.def
rename to CASA/logincapture/windows/lcredmgr.def
diff --git a/CASA/LoginCapture/windows/lcredmgr.h b/CASA/logincapture/windows/lcredmgr.h
similarity index 100%
rename from CASA/LoginCapture/windows/lcredmgr.h
rename to CASA/logincapture/windows/lcredmgr.h
diff --git a/CASA/LoginCapture/windows/lextend.cpp b/CASA/logincapture/windows/lextend.cpp
similarity index 100%
rename from CASA/LoginCapture/windows/lextend.cpp
rename to CASA/logincapture/windows/lextend.cpp
diff --git a/CASA/LoginCapture/windows/lextend.h b/CASA/logincapture/windows/lextend.h
similarity index 100%
rename from CASA/LoginCapture/windows/lextend.h
rename to CASA/logincapture/windows/lextend.h
diff --git a/CASA/LoginCapture/windows/micasa.lib b/CASA/logincapture/windows/micasa.lib
similarity index 100%
rename from CASA/LoginCapture/windows/micasa.lib
rename to CASA/logincapture/windows/micasa.lib
diff --git a/CASA/LoginCapture/windows/npapi.h b/CASA/logincapture/windows/npapi.h
similarity index 100%
rename from CASA/LoginCapture/windows/npapi.h
rename to CASA/logincapture/windows/npapi.h
diff --git a/CASA/LoginCapture/windows/windows.vcproj b/CASA/logincapture/windows/windows.vcproj
similarity index 100%
rename from CASA/LoginCapture/windows/windows.vcproj
rename to CASA/logincapture/windows/windows.vcproj
diff --git a/CASA/readme/readme-linux b/CASA/readme/readme-linux
new file mode 100644
index 00000000..fc5a0089
--- /dev/null
+++ b/CASA/readme/readme-linux
@@ -0,0 +1,31 @@
+-----------------------------------------------------------------
+REQUIREMENTS FOR BUILDING THE SOFTWARE PACKAGE ON LINUX
+-----------------------------------------------------------------
+
+  - Install latest mono and mono-devel (mono 1.1.13 or above)
+       www.go-mono.org
+  - Install JAVA 1.5
+       www.java.sun.com
+
+ 
+-----------------------------------------------------------------
+BUILD
+-----------------------------------------------------------------
+                                                                                                                     
+1. Generate autotools files:
+./autogen.sh --prefix=/<install_dir>  [--enable-debug]
+                                                                                                                     
+2. To reconfigure later, or to configure software that came from a source
+distribution (.tar.gz) file, use configure.
+./configure --prefix/<install_dir> [--enable-debug]
+(run ./configure --help for more options)
+                                                                                                                     
+3. Choose your make target, here are a few interesting ones:
+make - compile and create binaries
+
+make clean - clean up binaries
+
+make package - create source.tar.gz and rpm
+                                                                                                                     
+**make install - not available
+**make test - not available
diff --git a/CASA/readme/readme-win.txt b/CASA/readme/readme-win.txt
new file mode 100644
index 00000000..281ce9fe
--- /dev/null
+++ b/CASA/readme/readme-win.txt
@@ -0,0 +1,134 @@
+-----------------------------------------------------------------
+REQUIREMENTS FOR BUILDING THE SOFTWARE PACKAGE ON WINDOWS
+-----------------------------------------------------------------
+  - Install Visual Studio .NET 2003
+  - Install Cygwin
+  - Install JAVA 1.5
+  - Install GTK 2.6
+-----------------------------------------------------------------
+Installation and setup  Cygwin
+-----------------------------------------------------------------
+Download and start cygwin install:
+Browse to http://sources.redhat.com/cygwin/ 
+
+Click on "Install or update now!" or "Install Cygwin now"
+
+Cygwin Setup:
+Next
+
+Cygwin Setup - Choose Installation Type:
+Install from Internet
+Next
+
+Cygwin Setup - Choose Installation Directory:
+Root Directory: C:\cygwin
+Install For:  "All Users"
+
+Default Text File Type: DOS
+
+Cygwin Setup - Select Local Package Directory:
+  Local Package Directory: C:\cygwin-packages
+
+Cygwin Setup - Select Connection Type:
+  Direct Connection
+
+Choose A Download Site:
+  ftp://ftp.nas.nasa.gov 
+
+Cywin Setup - Select Packages:
+  Base:
+    defaults
+
+  Devel:
+    autoconf
+    automake
+    libtool
+    make
+    pkgconfig
+    cvs
+    gcc
+    gcc-g++
+
+  Editors:
+    vim (optional)
+
+  Net:
+    openssh
+    openssl
+
+  Text:
+    more
+
+  Utils:
+    clear (optional)
+
+Cygwin Setup - Create Icons:
+Finish
+
+------------------------------------------------------------------
+Installation of JAVA
+------------------------------------------------------------------
+Download the latest Jave JRE and J2EE from "http://java.sun.com"
+and install them on the machine.
+
+
+-----------------------------------------------------------------
+Installation of GTK
+-----------------------------------------------------------------
+
+-----------------------------------------------------------------
+Example of cygwin.bat
+-----------------------------------------------------------------
+Edit cygwin.bat (c:\cygwin\cygwin.bat) to add a call to
+%VS71COMNTOOLS%\vsvars32.bat (see example below). Also
+add the MSCS and JAVA_HOME environment parameters to
+this file. This sets up the Visual Studio and Java tools 
+in Cygwin.
+
+Sample cygwin.bat:
+
+@echo off
+
+set JAVA_HOME=C:/Program Files/Java/jdk1.5.0_07
+set VSINSTALLDIR=C:/Program Files/Microsoft Visual Studio .NET 2003/Common7/IDE
+set MSC=C:/Program Files/Microsoft Visual Studio .NET 2003/Vc7
+
+set PATH=%PATH%:/cygdrive/c/Program Files/Java/jdk1.5.0_07/bin
+set PATH=%PATH%:/cygdrive/c/Program Files/Microsoft Visual Studio .NET 2003/Vc7/bin
+set PATH=%PATH%:/cygdrive/c/Program Files/Microsoft Visual Studio .NET 2003/Common7/IDE
+
+set INCLUDE=%INCLUDE%;c:\Program Files\Java\jdk1.5.0_07\include
+set INCLUDE=%INCLUDE%;c:\Program Files\Java\jdk1.5.0_07\include\win32
+set INCLUDE=%INCLUDE%;c:\Program Files\Microsoft Visual Studio .NET 2003\Vc7\include
+
+C:
+chdir C:\cygwin\bin
+
+bash --login -i
+
+ 
+-----------------------------------------------------------------
+Build
+-----------------------------------------------------------------
+
+1.Start cygin (or Run cygwin.bat to start up Cygwin).
+                                                                                                                     
+2. Generate autotools files:
+./autogen.sh --prefix=/<install_dir>  [--enable-debug]
+                                                                                                                     
+3. To reconfigure later, or to configure software that came from a source
+distribution (.tar.gz) file, use configure.
+./configure --prefix/<install_dir> [--enable-debug]
+(run ./configure --help for more options)
+                                                                                                                    
+4. Choose your make target, here are a few interesting ones:
+make - compile and create binaries
+                                                                                                                     
+make clean - clean up binaries
+                                                                                                                     
+make package - create source.tar.gz and rpm
+                                                                                                                     
+**make install - not available
+**make test - not available
+ 
+                                                                                                                     
diff --git a/CASA/tools/linux/mk-casa-tar b/CASA/tools/linux/mk-casa-tar
index d14c1b12..e5eb6059 100755
--- a/CASA/tools/linux/mk-casa-tar
+++ b/CASA/tools/linux/mk-casa-tar
@@ -18,8 +18,8 @@ cd ~/bld_tst/CASA-$1.$2.$3
 
 #do dos2unx and remove unncessary directory
 
-dos2unix c_micasad/startup/micasad > /dev/null 2>&1 
-chmod +x c_micasad/startup/micasad
+dos2unix micasad/startup/micasad > /dev/null 2>&1 
+chmod +x micasad/startup/micasad
 rm -rf products bin bin64 lib lib64 obj obj64
 
 find . -name "*.lux" | xargs dos2unix > /dev/null 2>&1
@@ -43,10 +43,6 @@ find . -name "*.spec" | xargs dos2unix > /dev/null 2>&1
 find . -name "*.patch" | xargs dos2unix > /dev/null 2>&1
 find . -name "*.changes" | xargs dos2unix > /dev/null 2>&1
 
-rm -rf ./casa-yast
-rm -rf ./c_kwallet
-
-
 #create spec file from spec template
 cp -f ./package/linux/CASA.spec.in ./package/linux/CASA.spec 
 cp -f ./CASA.changes  ./package/linux/CASA.changes