Added filename cleanup and linkup of current modules for testing.