Restructured project

Restructured project