Rearrange project and make the final version