Starting to move it to an IntelliJ project