making method public and static again
final refactoring after updating project structure