Refactored the Files into AFiles, Files and MetadataFile. Broke some
functionality