Change directory layout.

Reviewers: cmarcelo

Differential Revision: http://phabricator.coderev.indt.org/D1392