Update project structure

Update project structure
Not working properly

Not working properly