Started reorganization of code into profiles