Clean up project structure (wip)