Second commit. Includes some basic packaging, a little renaming but more importantly formatted imports and file contents (for the most part).