Fixes for new folder structure