Cleaning up imports.
Moved things around! Packages should now all be capitalized. may need to to tweak git to ensure this...