Refactored the files into a package

Because packages make everything nicer