Added moq. Clean up files