re-organized project to make it more intuitive