Merge pull request #6 from wallace/master

Begin refactoring 'admin', 'manager' and 'diver' out of application code