Moved the clutter of src files into module folders