General housekeeping removed redundant files, relocate data and tasks.

cron will need to be updated