Just some more changes. Including moving everything to project and sourcing profile file in project directory.