refactor: moving classes, minor idea warnings