Made a lot of changes to the structure. I'm getting there, but still got some nasty ngResource errors