structure refactoring

Renaming foders