Cleaner struct, code separation
Merge branch 'master' of https://github.com/jrmbrgs/mean