Restructure completed code

Stuff has changed since I last logged in so I restructured the
directories a bit.