Moved files to correct location, also changed to use render