Small changes to align with pub expected folder structure