updating this structure to work for our current dev process and project structure