fix cmake stuff and refactor project structure (enough for this week!)