Moved project structure to a package