Moving functionality to correct modules
Prevent page caching
Updating some test files
Updating documentation to match new modules