Added layout class, wrote tests for it
...added untracked files