More comprehensible folder names.
Updating a lot of the core files.
Pulling in develop branch changes.