Added packages to the project and some classes