Can now create files container with associated metadata
removing .swp files
Merge remote-tracking branch 'internal/master'