Refactored directories.


Change-Id: I21c474a62a15e8de2100330d905fd1d5d879ecf0