Refactor directory structure

Change-Id: If90a9d9a2f2033726dedbf6ffda8d483707276e8