reformat folder structure
renaming structure
better folder structure