code cleanup from migration
reorganize project a bit