Fixed Packages

Remember, convention has package names beginning with Capital letters.
-Moved classes into better reflecting packages