Changed the file structure to fit standard package naming.