CM: move into IntelliJ project
CM: move to package