restructure project for intellij