moving files about

consolidate source and project files in the src directory