Clean Version

Cleaned up all messy(ish) code, updated it to have packages (v rook
before).