fix indentations
fix directory structure