Fixes for pathing
Changed folder structure