change to a better folder structure.