Clean up of imports and added new mock modules for ReadTheDocs