Code refactoring

- changed names for directories
- changed namespaces according to point 1