Unit and functional -> Model and controller

Rename the directories and use ‘describe’ blocks in place of explicit 
class definitions.