Re-organized root directory of framework