File structure reorganization

Signed-off-by: Hin Lam <max21226@Hin-Lams-iMac.local>