Development update

Several updates, and a major file structure change commit.