Fixed teh naming style of the files and package.