major changed on project directory, fix minor bugs