Reorganize project to properly separate derived/src info