Moved to maven + IntelliJ