Update Structure

THe structure was updated in the file system to support greater scalability
and was relabeled in some cases to make more sense such as config being renamed
settings.