changed to a better folder structure