Merge two modules, changing structure of project, add packages, change main class and method, add constant class