cleanup and reorder, intellij project structure added