Removed folders that were supposed to be submodule.  These submodules are a lie.
Added includes and refactored associations and scopes