changed folder hierarchy, all working now