Initial commit
Fixed structure