Fix for new folder hierarchy