Added a package, moved some stuff around!
Merge branch 'master' of https://github.com/pmsc73/cs3716.git