Major fixes to import / project structure