Work is done. Cleaing up and fixing hardcoded directories.