Change project folder structure and minor update on the codebook