Fixing file system layout.
Finished Role DSL.