Added basic project structure
Changed basic project structure
Fixed decorator issue