Fixing Lease model and spec
Changing directory structure