Moved some files around
Merge branch 'master' of https://github.com/Agrego/Agrego