Changing renderer directory structure and fixing addUnit