changed layout of project ot be easier and more scalable