Added the rest of the packages and classes. Deleted the other project.