created better folder structure