Packaged project to refactor structure