-Some identation fixes.
-Schema refactoring.
-Removed comments from schema file.
-