updated project structure to reflect packaging changes