more refactoring, readding project bases