Added files relevant for IntelliJ
Cleanup
Refactorings