Changed project struture - created a package for the project