Merge the filestructure branch

[ricardo lafuente]

I'm planning on merging the file-structure branch into our main
repository. Is anyone aware of any blockers or reasons why this
shouldn't be done now?