Refactoring of project. Changed package structure