Feature/refactor project org

See chat for more details.