Cleaned Up Master Folder Sort Of