Code refactoring

Some code can be moved into modules, fix some intellij warnings, make future change much easier.