Re-organizing project structure