Added IDEA project
Light refactorings