Renaming module
Changes passed through to all modules

Now begins unit testing and debugging proper