Re-arranged project structure