better arror checking
Refactoring in Progress Will not BUILD!
merged MetaData and metadata folders