Removed gender variable.
html files moved to mocks/
merged changes