More folder/file restructuring. Major UI changes.