Added additional project structure