Starting to move things around to accomodate mergeable folder structure.
More moving stuff around.
Still moving stuff around.