Moved some directories and streamlined color loading