First commit
Fixed file structre