Lot of cleanup for a more lightweight project structure