move directory definitions.
move directory definitions.


Former-commit-id: 23246456a3a617130299487210c9f72b27ae92d9 [formerly 5d478898e374affb2bd52d469f2a7644e6ddd12c] [formerly 9ba4e7497d3574e8bd56b76992bef52d7296e10f [formerly 4155697cf34faf3d81f89cc1620a5d464775d102]]
Former-commit-id: 6732f98dbeb9f41fb6f34cc7d40467648525163f [formerly b2cba95b553710c939e4e32cc83391497cd4b265]
Former-commit-id: f44fc3ededbad927f8a06d482c3b66a475d55767
jason-neal/eniric,jason-neal/eniric