Added some structure in the project