Reconstruct project structure

Reconstruct project structure