Better folder structure.