Replaced namespacing of 'api' with scoping.
Merge remote-tracking branch 'upstream/master'
Merge pull request #18 from maxluzuriaga/master

Cleaned up file structure for rails backend