re-arranged project structure