Merge pull request #706 from ddrone/dependencies

Removed extra spaces in Build.File imports for easier maintenance
Changed Annotated type to be a records, AnnotatedDecl is now a synonym
Merge branch 'ann-refactoring' into metadata-cli