Rework to use intellij default project structure