Added file structure
Fixed includes