Fix project name
Re organize the dir