Moved five files to another package
Moved away a few more functions