diff --git a/.gitattributes b/.gitattributes
index 887b98dd1d81c59ed6e20bd952f17c677038a844..c596da62ff951a758a81f65eafcc6b9cb2333d44 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -278,8 +278,6 @@ JAVA/LofarUtils/src/com/toedter/components/images/JSpinFieldMono16.gif -text
JAVA/LofarUtils/src/com/toedter/components/images/JSpinFieldMono32.gif -text
JAVA/MAC/jRSP/.cvsignore -text
JAVA/MAC/jRSP/nbproject/.cvsignore -text
-LCS/ACC/ACCbin/CMakeLists.txt -text
-LCS/ACC/ACCbin/src/CMakeLists.txt -text
LCS/ACC/CMakeLists.txt -text
LCS/AMC/AMCImpl/src/AMCServer.cc -text
LCS/AMC/amc_main_classes.png -text
@@ -306,6 +304,7 @@ MAC/APL/APLCommon/bootstrap -text svneol=native#application/octet-stream
MAC/APL/APLCommon/configure.in -text svneol=native#application/octet-stream
MAC/APL/APLCommon/src/Makefile.am -text svneol=native#application/octet-stream
MAC/APL/APLCommon/src/StartDaemon_Protocol.prot -text svneol=native#application/octet-stream
+MAC/APL/CEPCU/src/ApplController/CMakeLists.txt -text
MAC/APL/CUDaemons/src/LoggingClient/LoggingClient.log_prop -text
MAC/APL/CURTDBDaemons/src/LoggingProcessor/LoggingProcessor.conf -text
MAC/APL/CURTDBDaemons/src/LoggingProcessor/LoggingProcessor.log_prop -text
diff --git a/.gitignore b/.gitignore
index aa22377778afc0d841fdccd3e9f18181a65d28f0..ceccf8b529a5137b7ff136fa27329c93cb90852b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -74,9 +74,6 @@ JAVA/MAC/jRSP/Makefile.common
JAVA/MAC/jRSP/autoconf_share
JAVA/MAC/jRSP/lofarconf
JAVA/MAC/jRSP/nbproject/private
-LCS/ACC/ACCbin/Makefile.common
-LCS/ACC/ACCbin/autoconf_share
-LCS/ACC/ACCbin/lofarconf
LCS/ACC/ALC/Makefile.common
LCS/ACC/ALC/autoconf_share
LCS/ACC/ALC/lofarconf
diff --git a/LCS/ACC/ACCbin/ACCbin.spec.in b/LCS/ACC/ACCbin/ACCbin.spec.in
deleted file mode 100644
index ff280b8f98cac1aa486a83737bf175c8e473d513..0000000000000000000000000000000000000000
--- a/LCS/ACC/ACCbin/ACCbin.spec.in
+++ /dev/null
@@ -1,166 +0,0 @@
-# -*- Mode:rpm-spec -*-
-# ACCbin.spec.in
-#
-
-##############################################################################
-#
-# Preamble
-#
-##############################################################################
-
-Summary: ACCbin contains the controller and daemon of ACC.
-
-%define release @RPM_RELEASE@
-%define version @VERSION@
-%define pkgname @PACKAGE@
-%define pkgdir %{pkgname}-%{version}-%{release}
-%define prefix /opt/lofar
-%define configure_args @RPM_CONFIGURE_ARGS@
-##define build_kernel_version @BUILD_KERNEL_VERSION@
-
-Name: %{pkgname}
-Version: %{version}
-Release: %{release}
-Copyright: LGPL
-Group: Application/System
-Source: %{pkgname}-%{version}.tar.gz
-BuildRoot: %{_tmppath}/%{pkgdir}-root
-URL: http://www.astron.nl
-Prefix: %{prefix}
-BuildArchitectures: i386 # Target platforms, i.e., i586
-#Requires: Common >= 3.0
-#Requires: Transport >= 2.3
-#Requires: APS >= 2.1
-#Requires: ALC >= 2.1
-#Requires: PLC >= 2.1
-Packager: %{packager}
-Distribution: The LOFAR project
-Vendor: ASTRON
-
-AutoReqProv: no
-
-%description
-
-ACCbin contains two executables: the ACC daemon that manages the administration
-and lifecycle of the ACC controllers, and secondly the ACCcontroller that is
-the executable the ACC processes and the ACC user connect to.
-
-##############################################################################
-#
-# prep
-#
-##############################################################################
-%prep
-echo $prefix
-
-# create the build directory, untar the source
-%setup
-
-##############################################################################
-#
-# build
-#
-##############################################################################
-%build
-./configure %{configure_args} --prefix=%{prefix} && make
-
-##############################################################################
-#
-# install
-#
-##############################################################################
-%install
-# To make things work with BUILDROOT
-if [ "$RPM_BUILD_ROOT" != "%{_tmppath}/%{pkgdir}-root" ]
-then
- echo
- echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
- echo @ @
- echo @ RPM_BUILD_ROOT is not what I expected. Please clean it yourself. @
- echo @ @
- echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
- echo
-else
- echo Cleaning RPM_BUILD_ROOT: "$RPM_BUILD_ROOT"
- rm -rf "$RPM_BUILD_ROOT"
-fi
-mkdir -p $RPM_BUILD_ROOT%{prefix}
-make DESTDIR="$RPM_BUILD_ROOT" install
-
-#uninstall
-
-##############################################################################
-#
-# verify
-#
-##############################################################################
-#verify
-
-##############################################################################
-#
-# clean
-#
-##############################################################################
-%clean
-# Call me paranoid, but I do not want to be responsible for nuking
-# someone's harddrive!
-if [ "$RPM_BUILD_ROOT" != "%{_tmppath}/%{pkgdir}-root" ]
-then
- echo
- echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
- echo @ @
- echo @ RPM_BUILD_ROOT is not what I expected. Please clean it yourself. @
- echo @ @
- echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
- echo
-else
- echo Cleaning RPM_BUILD_ROOT: "$RPM_BUILD_ROOT"
- rm -rf "$RPM_BUILD_ROOT"
-fi
-
-##############################################################################
-#
-# files
-#
-##############################################################################
-
-# empty 'files' means all distributed files
-%files
-%defattr(-, root, root)
-%{prefix}
-
-# Your application file list goes here
-# %{prefix}/lib/lib*.so*
-
-# Documentation
-# doc COPYING ChangeLog README AUTHORS NEWS
-# doc doc/*
-
-# link the module to the correct path
-%post
-
-# before uninstall
-%preun
-
-# after uninstall
-%postun
-
-##############################################################################
-#
-# package devel
-#
-##############################################################################
-
-#package devel
-#Summary: Development files for %{pkgname}
-#Group: Applications/System
-#description devel
-#Development files for %{pkgname}.
-
-#files devel
-
-# Your development files go here
-# Programmers documentation goes here
-#doc doc
-
-# end of file
diff --git a/LCS/ACC/ACCbin/CMakeLists.txt b/LCS/ACC/ACCbin/CMakeLists.txt
deleted file mode 100644
index 35b2288677ee9c98cf4a10e24e7a8edf228959d5..0000000000000000000000000000000000000000
--- a/LCS/ACC/ACCbin/CMakeLists.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-
-## ------------------------------------------------------------------------------
-## Directories to be included in the build
-
-add_subdirectory (src)
-add_subdirectory (test)
diff --git a/LCS/ACC/ACCbin/Makefile.am b/LCS/ACC/ACCbin/Makefile.am
deleted file mode 100644
index 29a71df5e217d5ed9d3525857dd53eccd69f6fae..0000000000000000000000000000000000000000
--- a/LCS/ACC/ACCbin/Makefile.am
+++ /dev/null
@@ -1,20 +0,0 @@
-SUBDIRS=src test
-
-ACLOCAL_AMFLAGS = -I $(top_srcdir)/autoconf_share
-
-pkgextdir = $(prefix)/config/$(PACKAGE)
-pkgext_DATA = pkgext pkgextcppflags pkgextcxxflags pkgextldflags
-
-DISTCHECK_CONFIGURE_FLAGS=\
- --with-common=$(prefix) \
- --with-transport=$(prefix) \
- --with-aps=$(prefix) \
- --with-alc=$(prefix) \
- --with-plc=$(prefix)
-
-EXTRA_DIST = \
- Makefile.common \
- ACCbin.spec \
- autoconf_share/compiletool
-
-include $(top_srcdir)/Makefile.common
diff --git a/LCS/ACC/ACCbin/bootstrap b/LCS/ACC/ACCbin/bootstrap
deleted file mode 100755
index 06f18cde1dbfd6912ef7d927c4d35d25c7137a62..0000000000000000000000000000000000000000
--- a/LCS/ACC/ACCbin/bootstrap
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-../../../autoconf_share/bootstrap ../../../autoconf_share
diff --git a/LCS/ACC/ACCbin/configure.in b/LCS/ACC/ACCbin/configure.in
deleted file mode 100644
index 83efa64b364b61ac30e40ed4f283a9c936cae07a..0000000000000000000000000000000000000000
--- a/LCS/ACC/ACCbin/configure.in
+++ /dev/null
@@ -1,71 +0,0 @@
-dnl
-dnl Process this file with autoconf to produce a configure script.
-dnl
-AC_INIT
-AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(ACC, 2.1, no-define)
-
-dnl
-dnl Initialize for LOFAR (may set compilers)
-dnl
-lofar_INIT
-
-dnl Checks for programs.
-AC_PROG_AWK
-AC_PROG_YACC
-AC_PROG_CC
-AC_PROG_CXX
-AM_PROG_LEX
-AC_PROG_INSTALL
-AC_PROG_LN_S
-AC_DISABLE_SHARED
-AC_PROG_LIBTOOL
-
-dnl Checks for libraries.
-
-dnl dnl Replace `main' with a function in -lfl:
-dnl AC_CHECK_LIB(fl, main)
-dnl dnl Replace `main' with a function in -lcosev_r:
-dnl AC_CHECK_LIB(cosev_r, main)
-dnl dnl Replace `main' with a function in -lcosnm_r:
-dnl AC_CHECK_LIB(cosnm_r, main)
-dnl dnl Replace `main' with a function in -lorb_r:
-dnl AC_CHECK_LIB(orb_r, main)
-dnl dnl Replace `main' with a function in -lpthread:
-dnl AC_CHECK_LIB(pthread, main)
-dnl dnl Replace `main' with a function in -lvport_r:
-dnl AC_CHECK_LIB(vport_r, main)
-
-dnl Checks for header files.
-AC_HEADER_STDC
-AC_CHECK_HEADERS(unistd.h)
-
-dnl Checks for typedefs, structures, and compiler characteristics.
-AC_C_CONST
-AC_TYPE_SIZE_T
-
-dnl Checks for library functions.
-AC_FUNC_VPRINTF
-
-dnl
-dnl Check for LOFAR specific things
-dnl
-lofar_GENERAL
-lofar_INTERNAL(LCS/Common,Common,,1,Common/LofarTypedefs.h,,)
-lofar_INTERNAL(LCS/Transport,Transport,,1,Transport/TransportHolder.h,,)
-lofar_INTERNAL(LCS/ACC/APS,APS,,1,APS/ParameterSet.h,,)
-lofar_INTERNAL(LCS/ACC/ALC,ALC,,1,ALC/ApplControl.h,,)
-lofar_INTERNAL(LCS/ACC/PLC,PLC,,1,PLC/ProcessControl.h,,)
-lofar_INTERNAL(MAC/MACIO, MACIO,,1,MACIO/MACServiceInfo.h,"kvt_protocol log_protocol macio",)
-dnl Note: only the test programs depend on the tribool functionality
-lofar_EXTERNAL(boost,1,boost/logic/tribool.hpp,"")
-
-dnl
-dnl Output Makefiles
-dnl
-AC_OUTPUT(
-Makefile
-src/Makefile
-test/Makefile
-ACCbin.spec
-)
diff --git a/LCS/ACC/ACCbin/package.dox b/LCS/ACC/ACCbin/package.dox
deleted file mode 100644
index 86269ae3671a181df27403aaaa6e794db23db458..0000000000000000000000000000000000000000
--- a/LCS/ACC/ACCbin/package.dox
+++ /dev/null
@@ -1,8 +0,0 @@
-//
-//
-// \ingroup ACC
-// \defgroup ACCbin Executables of ACC (ACCbin)
-//
-// Contains the programs ACDaemon and ApplController
-//
-
diff --git a/MAC/APL/CEPCU/configure.in b/MAC/APL/CEPCU/configure.in
index 93096d27989fd971c0494570fcc5d1158672d2e6..95fa78353df25e50187385e8aa8b56b05810cf94 100644
--- a/MAC/APL/CEPCU/configure.in
+++ b/MAC/APL/CEPCU/configure.in
@@ -74,7 +74,7 @@ dnl Output Makefiles
dnl
AC_OUTPUT(
src/Makefile
-dnl src/ACCControl/Makefile
+src/ApplController/Makefile
src/OnlineControl/Makefile
dnl src/OfflineControl/Makefile
Makefile
diff --git a/LCS/ACC/ACCbin/src/ACCmdImpl.cc b/MAC/APL/CEPCU/src/ApplController/ACCmdImpl.cc
similarity index 100%
rename from LCS/ACC/ACCbin/src/ACCmdImpl.cc
rename to MAC/APL/CEPCU/src/ApplController/ACCmdImpl.cc
diff --git a/LCS/ACC/ACCbin/src/ACCmdImpl.h b/MAC/APL/CEPCU/src/ApplController/ACCmdImpl.h
similarity index 100%
rename from LCS/ACC/ACCbin/src/ACCmdImpl.h
rename to MAC/APL/CEPCU/src/ApplController/ACCmdImpl.h
diff --git a/LCS/ACC/ACCbin/src/ACDaemon.cc b/MAC/APL/CEPCU/src/ApplController/ACDaemon.cc
similarity index 100%
rename from LCS/ACC/ACCbin/src/ACDaemon.cc
rename to MAC/APL/CEPCU/src/ApplController/ACDaemon.cc
diff --git a/LCS/ACC/ACCbin/src/ACDaemon.conf b/MAC/APL/CEPCU/src/ApplController/ACDaemon.conf
similarity index 100%
rename from LCS/ACC/ACCbin/src/ACDaemon.conf
rename to MAC/APL/CEPCU/src/ApplController/ACDaemon.conf
diff --git a/LCS/ACC/ACCbin/src/ACDaemon.h b/MAC/APL/CEPCU/src/ApplController/ACDaemon.h
similarity index 100%
rename from LCS/ACC/ACCbin/src/ACDaemon.h
rename to MAC/APL/CEPCU/src/ApplController/ACDaemon.h
diff --git a/LCS/ACC/ACCbin/src/ACDaemon.log_prop b/MAC/APL/CEPCU/src/ApplController/ACDaemon.log_prop
similarity index 100%
rename from LCS/ACC/ACCbin/src/ACDaemon.log_prop
rename to MAC/APL/CEPCU/src/ApplController/ACDaemon.log_prop
diff --git a/LCS/ACC/ACCbin/src/ACDaemonComm.cc b/MAC/APL/CEPCU/src/ApplController/ACDaemonComm.cc
similarity index 100%
rename from LCS/ACC/ACCbin/src/ACDaemonComm.cc
rename to MAC/APL/CEPCU/src/ApplController/ACDaemonComm.cc
diff --git a/LCS/ACC/ACCbin/src/ACDaemonComm.h b/MAC/APL/CEPCU/src/ApplController/ACDaemonComm.h
similarity index 100%
rename from LCS/ACC/ACCbin/src/ACDaemonComm.h
rename to MAC/APL/CEPCU/src/ApplController/ACDaemonComm.h
diff --git a/LCS/ACC/ACCbin/src/ACDaemonMain.cc b/MAC/APL/CEPCU/src/ApplController/ACDaemonMain.cc
similarity index 100%
rename from LCS/ACC/ACCbin/src/ACDaemonMain.cc
rename to MAC/APL/CEPCU/src/ApplController/ACDaemonMain.cc
diff --git a/LCS/ACC/ACCbin/src/ACRequestPool.cc b/MAC/APL/CEPCU/src/ApplController/ACRequestPool.cc
similarity index 100%
rename from LCS/ACC/ACCbin/src/ACRequestPool.cc
rename to MAC/APL/CEPCU/src/ApplController/ACRequestPool.cc
diff --git a/LCS/ACC/ACCbin/src/ACRequestPool.h b/MAC/APL/CEPCU/src/ApplController/ACRequestPool.h
similarity index 100%
rename from LCS/ACC/ACCbin/src/ACRequestPool.h
rename to MAC/APL/CEPCU/src/ApplController/ACRequestPool.h
diff --git a/LCS/ACC/ACCbin/src/ACcli.cc b/MAC/APL/CEPCU/src/ApplController/ACcli.cc
similarity index 100%
rename from LCS/ACC/ACCbin/src/ACcli.cc
rename to MAC/APL/CEPCU/src/ApplController/ACcli.cc
diff --git a/LCS/ACC/ACCbin/src/ACuserMenu.cc b/MAC/APL/CEPCU/src/ApplController/ACuserMenu.cc
similarity index 100%
rename from LCS/ACC/ACCbin/src/ACuserMenu.cc
rename to MAC/APL/CEPCU/src/ApplController/ACuserMenu.cc
diff --git a/LCS/ACC/ACCbin/src/ACuserMenu.log_prop b/MAC/APL/CEPCU/src/ApplController/ACuserMenu.log_prop
similarity index 100%
rename from LCS/ACC/ACCbin/src/ACuserMenu.log_prop
rename to MAC/APL/CEPCU/src/ApplController/ACuserMenu.log_prop
diff --git a/LCS/ACC/ACCbin/src/APAdmin.cc b/MAC/APL/CEPCU/src/ApplController/APAdmin.cc
similarity index 100%
rename from LCS/ACC/ACCbin/src/APAdmin.cc
rename to MAC/APL/CEPCU/src/ApplController/APAdmin.cc
diff --git a/LCS/ACC/ACCbin/src/APAdmin.h b/MAC/APL/CEPCU/src/ApplController/APAdmin.h
similarity index 100%
rename from LCS/ACC/ACCbin/src/APAdmin.h
rename to MAC/APL/CEPCU/src/ApplController/APAdmin.h
diff --git a/LCS/ACC/ACCbin/src/APAdminPool.cc b/MAC/APL/CEPCU/src/ApplController/APAdminPool.cc
similarity index 100%
rename from LCS/ACC/ACCbin/src/APAdminPool.cc
rename to MAC/APL/CEPCU/src/ApplController/APAdminPool.cc
diff --git a/LCS/ACC/ACCbin/src/APAdminPool.h b/MAC/APL/CEPCU/src/ApplController/APAdminPool.h
similarity index 100%
rename from LCS/ACC/ACCbin/src/APAdminPool.h
rename to MAC/APL/CEPCU/src/ApplController/APAdminPool.h
diff --git a/LCS/ACC/ACCbin/src/ApplController.cc b/MAC/APL/CEPCU/src/ApplController/ApplController.cc
similarity index 100%
rename from LCS/ACC/ACCbin/src/ApplController.cc
rename to MAC/APL/CEPCU/src/ApplController/ApplController.cc
diff --git a/LCS/ACC/ACCbin/src/ApplController.h b/MAC/APL/CEPCU/src/ApplController/ApplController.h
similarity index 100%
rename from LCS/ACC/ACCbin/src/ApplController.h
rename to MAC/APL/CEPCU/src/ApplController/ApplController.h
diff --git a/LCS/ACC/ACCbin/src/ApplController.log_prop b/MAC/APL/CEPCU/src/ApplController/ApplController.log_prop
similarity index 100%
rename from LCS/ACC/ACCbin/src/ApplController.log_prop
rename to MAC/APL/CEPCU/src/ApplController/ApplController.log_prop
diff --git a/LCS/ACC/ACCbin/src/ApplControllerMain.cc b/MAC/APL/CEPCU/src/ApplController/ApplControllerMain.cc
similarity index 100%
rename from LCS/ACC/ACCbin/src/ApplControllerMain.cc
rename to MAC/APL/CEPCU/src/ApplController/ApplControllerMain.cc
diff --git a/LCS/ACC/ACCbin/src/CMakeLists.txt b/MAC/APL/CEPCU/src/ApplController/CMakeLists.txt
similarity index 100%
rename from LCS/ACC/ACCbin/src/CMakeLists.txt
rename to MAC/APL/CEPCU/src/ApplController/CMakeLists.txt
diff --git a/LCS/ACC/ACCbin/src/CmdStack.cc b/MAC/APL/CEPCU/src/ApplController/CmdStack.cc
similarity index 100%
rename from LCS/ACC/ACCbin/src/CmdStack.cc
rename to MAC/APL/CEPCU/src/ApplController/CmdStack.cc
diff --git a/LCS/ACC/ACCbin/src/CmdStack.h b/MAC/APL/CEPCU/src/ApplController/CmdStack.h
similarity index 100%
rename from LCS/ACC/ACCbin/src/CmdStack.h
rename to MAC/APL/CEPCU/src/ApplController/CmdStack.h
diff --git a/LCS/ACC/ACCbin/src/ConfigurationMgr.cc b/MAC/APL/CEPCU/src/ApplController/ConfigurationMgr.cc
similarity index 100%
rename from LCS/ACC/ACCbin/src/ConfigurationMgr.cc
rename to MAC/APL/CEPCU/src/ApplController/ConfigurationMgr.cc
diff --git a/LCS/ACC/ACCbin/src/ConfigurationMgr.h b/MAC/APL/CEPCU/src/ApplController/ConfigurationMgr.h
similarity index 100%
rename from LCS/ACC/ACCbin/src/ConfigurationMgr.h
rename to MAC/APL/CEPCU/src/ApplController/ConfigurationMgr.h
diff --git a/LCS/ACC/ACCbin/src/DH_OTDBlog.cc b/MAC/APL/CEPCU/src/ApplController/DH_OTDBlog.cc
similarity index 100%
rename from LCS/ACC/ACCbin/src/DH_OTDBlog.cc
rename to MAC/APL/CEPCU/src/ApplController/DH_OTDBlog.cc
diff --git a/LCS/ACC/ACCbin/src/DH_OTDBlog.h b/MAC/APL/CEPCU/src/ApplController/DH_OTDBlog.h
similarity index 100%
rename from LCS/ACC/ACCbin/src/DH_OTDBlog.h
rename to MAC/APL/CEPCU/src/ApplController/DH_OTDBlog.h
diff --git a/LCS/ACC/ACCbin/src/ItemList.cc b/MAC/APL/CEPCU/src/ApplController/ItemList.cc
similarity index 100%
rename from LCS/ACC/ACCbin/src/ItemList.cc
rename to MAC/APL/CEPCU/src/ApplController/ItemList.cc
diff --git a/LCS/ACC/ACCbin/src/ItemList.h b/MAC/APL/CEPCU/src/ApplController/ItemList.h
similarity index 100%
rename from LCS/ACC/ACCbin/src/ItemList.h
rename to MAC/APL/CEPCU/src/ApplController/ItemList.h
diff --git a/LCS/ACC/ACCbin/src/Makefile.am b/MAC/APL/CEPCU/src/ApplController/Makefile.am
similarity index 100%
rename from LCS/ACC/ACCbin/src/Makefile.am
rename to MAC/APL/CEPCU/src/ApplController/Makefile.am
diff --git a/LCS/ACC/ACCbin/src/OTDBComm.cc b/MAC/APL/CEPCU/src/ApplController/OTDBComm.cc
similarity index 100%
rename from LCS/ACC/ACCbin/src/OTDBComm.cc
rename to MAC/APL/CEPCU/src/ApplController/OTDBComm.cc
diff --git a/LCS/ACC/ACCbin/src/OTDBComm.h b/MAC/APL/CEPCU/src/ApplController/OTDBComm.h
similarity index 100%
rename from LCS/ACC/ACCbin/src/OTDBComm.h
rename to MAC/APL/CEPCU/src/ApplController/OTDBComm.h
diff --git a/LCS/ACC/ACCbin/src/ObsA.param b/MAC/APL/CEPCU/src/ApplController/ObsA.param
similarity index 100%
rename from LCS/ACC/ACCbin/src/ObsA.param
rename to MAC/APL/CEPCU/src/ApplController/ObsA.param
diff --git a/LCS/ACC/ACCbin/src/PR_BGL.cc b/MAC/APL/CEPCU/src/ApplController/PR_BGL.cc
similarity index 100%
rename from LCS/ACC/ACCbin/src/PR_BGL.cc
rename to MAC/APL/CEPCU/src/ApplController/PR_BGL.cc
diff --git a/LCS/ACC/ACCbin/src/PR_BGL.h b/MAC/APL/CEPCU/src/ApplController/PR_BGL.h
similarity index 100%
rename from LCS/ACC/ACCbin/src/PR_BGL.h
rename to MAC/APL/CEPCU/src/ApplController/PR_BGL.h
diff --git a/LCS/ACC/ACCbin/src/PR_MPI.cc b/MAC/APL/CEPCU/src/ApplController/PR_MPI.cc
similarity index 100%
rename from LCS/ACC/ACCbin/src/PR_MPI.cc
rename to MAC/APL/CEPCU/src/ApplController/PR_MPI.cc
diff --git a/LCS/ACC/ACCbin/src/PR_MPI.h b/MAC/APL/CEPCU/src/ApplController/PR_MPI.h
similarity index 100%
rename from LCS/ACC/ACCbin/src/PR_MPI.h
rename to MAC/APL/CEPCU/src/ApplController/PR_MPI.h
diff --git a/LCS/ACC/ACCbin/src/PR_Shell.cc b/MAC/APL/CEPCU/src/ApplController/PR_Shell.cc
similarity index 100%
rename from LCS/ACC/ACCbin/src/PR_Shell.cc
rename to MAC/APL/CEPCU/src/ApplController/PR_Shell.cc
diff --git a/LCS/ACC/ACCbin/src/PR_Shell.h b/MAC/APL/CEPCU/src/ApplController/PR_Shell.h
similarity index 100%
rename from LCS/ACC/ACCbin/src/PR_Shell.h
rename to MAC/APL/CEPCU/src/ApplController/PR_Shell.h
diff --git a/LCS/ACC/ACCbin/src/ParCollRecord.cc b/MAC/APL/CEPCU/src/ApplController/ParCollRecord.cc
similarity index 100%
rename from LCS/ACC/ACCbin/src/ParCollRecord.cc
rename to MAC/APL/CEPCU/src/ApplController/ParCollRecord.cc
diff --git a/LCS/ACC/ACCbin/src/ParCollRecord.h b/MAC/APL/CEPCU/src/ApplController/ParCollRecord.h
similarity index 100%
rename from LCS/ACC/ACCbin/src/ParCollRecord.h
rename to MAC/APL/CEPCU/src/ApplController/ParCollRecord.h
diff --git a/LCS/ACC/ACCbin/src/ProcRule.cc b/MAC/APL/CEPCU/src/ApplController/ProcRule.cc
similarity index 100%
rename from LCS/ACC/ACCbin/src/ProcRule.cc
rename to MAC/APL/CEPCU/src/ApplController/ProcRule.cc
diff --git a/LCS/ACC/ACCbin/src/ProcRule.h b/MAC/APL/CEPCU/src/ApplController/ProcRule.h
similarity index 100%
rename from LCS/ACC/ACCbin/src/ProcRule.h
rename to MAC/APL/CEPCU/src/ApplController/ProcRule.h
diff --git a/LCS/ACC/ACCbin/src/ProcRuler.cc b/MAC/APL/CEPCU/src/ApplController/ProcRuler.cc
similarity index 100%
rename from LCS/ACC/ACCbin/src/ProcRuler.cc
rename to MAC/APL/CEPCU/src/ApplController/ProcRuler.cc
diff --git a/LCS/ACC/ACCbin/src/ProcRuler.h b/MAC/APL/CEPCU/src/ApplController/ProcRuler.h
similarity index 100%
rename from LCS/ACC/ACCbin/src/ProcRuler.h
rename to MAC/APL/CEPCU/src/ApplController/ProcRuler.h
diff --git a/LCS/ACC/ACCbin/src/StateEngine.cc b/MAC/APL/CEPCU/src/ApplController/StateEngine.cc
similarity index 100%
rename from LCS/ACC/ACCbin/src/StateEngine.cc
rename to MAC/APL/CEPCU/src/ApplController/StateEngine.cc
diff --git a/LCS/ACC/ACCbin/src/StateEngine.h b/MAC/APL/CEPCU/src/ApplController/StateEngine.h
similarity index 100%
rename from LCS/ACC/ACCbin/src/StateEngine.h
rename to MAC/APL/CEPCU/src/ApplController/StateEngine.h
diff --git a/LCS/ACC/ACCbin/src/lofarDirs.h b/MAC/APL/CEPCU/src/ApplController/lofarDirs.h
similarity index 100%
rename from LCS/ACC/ACCbin/src/lofarDirs.h
rename to MAC/APL/CEPCU/src/ApplController/lofarDirs.h
diff --git a/LCS/ACC/ACCbin/src/myACClientFunctions.h b/MAC/APL/CEPCU/src/ApplController/myACClientFunctions.h
similarity index 100%
rename from LCS/ACC/ACCbin/src/myACClientFunctions.h
rename to MAC/APL/CEPCU/src/ApplController/myACClientFunctions.h
diff --git a/LCS/ACC/ACCbin/src/startAP.sh b/MAC/APL/CEPCU/src/ApplController/startAP.sh
similarity index 100%
rename from LCS/ACC/ACCbin/src/startAP.sh
rename to MAC/APL/CEPCU/src/ApplController/startAP.sh
diff --git a/LCS/ACC/ACCbin/src/startBGL.sh b/MAC/APL/CEPCU/src/ApplController/startBGL.sh
similarity index 100%
rename from LCS/ACC/ACCbin/src/startBGL.sh
rename to MAC/APL/CEPCU/src/ApplController/startBGL.sh
diff --git a/LCS/ACC/ACCbin/src/startMPI.sh b/MAC/APL/CEPCU/src/ApplController/startMPI.sh
similarity index 100%
rename from LCS/ACC/ACCbin/src/startMPI.sh
rename to MAC/APL/CEPCU/src/ApplController/startMPI.sh
diff --git a/LCS/ACC/ACCbin/src/stopAP.sh b/MAC/APL/CEPCU/src/ApplController/stopAP.sh
similarity index 100%
rename from LCS/ACC/ACCbin/src/stopAP.sh
rename to MAC/APL/CEPCU/src/ApplController/stopAP.sh
diff --git a/LCS/ACC/ACCbin/src/stopBGL.sh b/MAC/APL/CEPCU/src/ApplController/stopBGL.sh
similarity index 100%
rename from LCS/ACC/ACCbin/src/stopBGL.sh
rename to MAC/APL/CEPCU/src/ApplController/stopBGL.sh
diff --git a/LCS/ACC/ACCbin/src/stopMPI.sh b/MAC/APL/CEPCU/src/ApplController/stopMPI.sh
similarity index 100%
rename from LCS/ACC/ACCbin/src/stopMPI.sh
rename to MAC/APL/CEPCU/src/ApplController/stopMPI.sh
diff --git a/MAC/APL/CEPCU/src/Makefile.am b/MAC/APL/CEPCU/src/Makefile.am
index 5df22c525c12b7a74772847396b2baf8ebecb0e2..50bc94129400546af4ab445aa9828fb678771be9 100644
--- a/MAC/APL/CEPCU/src/Makefile.am
+++ b/MAC/APL/CEPCU/src/Makefile.am
@@ -1,6 +1,6 @@
pkginclude_HEADERS = Package__Version.h
-SUBDIRS = OnlineControl # OfflineControl ACCControl
+SUBDIRS = ApplController OnlineControl # OfflineControl
bin_PROGRAMS = versioncepcu
diff --git a/LCS/ACC/ACCbin/test/APCmdImpl.cc b/MAC/APL/CEPCU/test/ApplController/APCmdImpl.cc
similarity index 100%
rename from LCS/ACC/ACCbin/test/APCmdImpl.cc
rename to MAC/APL/CEPCU/test/ApplController/APCmdImpl.cc
diff --git a/LCS/ACC/ACCbin/test/APCmdImpl.h b/MAC/APL/CEPCU/test/ApplController/APCmdImpl.h
similarity index 100%
rename from LCS/ACC/ACCbin/test/APCmdImpl.h
rename to MAC/APL/CEPCU/test/ApplController/APCmdImpl.h
diff --git a/LCS/ACC/ACCbin/test/APExample.cc b/MAC/APL/CEPCU/test/ApplController/APExample.cc
similarity index 100%
rename from LCS/ACC/ACCbin/test/APExample.cc
rename to MAC/APL/CEPCU/test/ApplController/APExample.cc
diff --git a/LCS/ACC/ACCbin/test/APTest.cc b/MAC/APL/CEPCU/test/ApplController/APTest.cc
similarity index 100%
rename from LCS/ACC/ACCbin/test/APTest.cc
rename to MAC/APL/CEPCU/test/ApplController/APTest.cc
diff --git a/LCS/ACC/ACCbin/test/APTest.log_prop b/MAC/APL/CEPCU/test/ApplController/APTest.log_prop
similarity index 100%
rename from LCS/ACC/ACCbin/test/APTest.log_prop
rename to MAC/APL/CEPCU/test/ApplController/APTest.log_prop
diff --git a/LCS/ACC/ACCbin/test/Makefile.am b/MAC/APL/CEPCU/test/ApplController/Makefile.am
similarity index 100%
rename from LCS/ACC/ACCbin/test/Makefile.am
rename to MAC/APL/CEPCU/test/ApplController/Makefile.am
diff --git a/LCS/ACC/ACCbin/test/tConfMgr.cc b/MAC/APL/CEPCU/test/ApplController/tConfMgr.cc
similarity index 100%
rename from LCS/ACC/ACCbin/test/tConfMgr.cc
rename to MAC/APL/CEPCU/test/ApplController/tConfMgr.cc
diff --git a/LCS/ACC/ACCbin/test/templates/applicationQ.ps b/MAC/APL/CEPCU/test/ApplController/templates/applicationQ.ps
similarity index 100%
rename from LCS/ACC/ACCbin/test/templates/applicationQ.ps
rename to MAC/APL/CEPCU/test/ApplController/templates/applicationQ.ps
diff --git a/LCS/ACC/ACCbin/test/templates/moduleA.ps b/MAC/APL/CEPCU/test/ApplController/templates/moduleA.ps
similarity index 100%
rename from LCS/ACC/ACCbin/test/templates/moduleA.ps
rename to MAC/APL/CEPCU/test/ApplController/templates/moduleA.ps
diff --git a/LCS/ACC/ACCbin/test/templates/moduleC.ps b/MAC/APL/CEPCU/test/ApplController/templates/moduleC.ps
similarity index 100%
rename from LCS/ACC/ACCbin/test/templates/moduleC.ps
rename to MAC/APL/CEPCU/test/ApplController/templates/moduleC.ps
diff --git a/LCS/ACC/ACCbin/test/templates/moduleD.ps b/MAC/APL/CEPCU/test/ApplController/templates/moduleD.ps
similarity index 100%
rename from LCS/ACC/ACCbin/test/templates/moduleD.ps
rename to MAC/APL/CEPCU/test/ApplController/templates/moduleD.ps
diff --git a/LCS/ACC/ACCbin/test/templates/moduleE.ps b/MAC/APL/CEPCU/test/ApplController/templates/moduleE.ps
similarity index 100%
rename from LCS/ACC/ACCbin/test/templates/moduleE.ps
rename to MAC/APL/CEPCU/test/ApplController/templates/moduleE.ps
diff --git a/LCS/ACC/ACCbin/test/templates/processF.ps b/MAC/APL/CEPCU/test/ApplController/templates/processF.ps
similarity index 100%
rename from LCS/ACC/ACCbin/test/templates/processF.ps
rename to MAC/APL/CEPCU/test/ApplController/templates/processF.ps
diff --git a/LCS/ACC/ACCbin/test/templates/processG.ps b/MAC/APL/CEPCU/test/ApplController/templates/processG.ps
similarity index 100%
rename from LCS/ACC/ACCbin/test/templates/processG.ps
rename to MAC/APL/CEPCU/test/ApplController/templates/processG.ps