Fixed schema, revectored comments and project dependacies