simple code cleanup
rename folder
fix after renaming