Refactoring, metadata and adapter specific files