Fixing folder structure - UPDATED