Changing project layout for ease in distribution