Rearrange file structure
Add spec for object fields