Changed a bunch of file names and namespaces
Merge branch 'master' of https://github.com/danielhokanson/Basic-Api