[ issue #2 ] Fix on project layout