Reconfig project structure