add additional information to setup
Fix pathing to new structure