Added BaseController
Added DirectoryController
Merge branch 'working'