Folder structure + namespaces refactoring