restructuring so that all source is under src