Fixed startup config and cleaned up project