Refactoring architecture (src is not a package)