reorganoze touching files
fix directory structure