Refactor and fix service uniqueness checker, set a custom message on NotUniqueError
Move modules to modules folder