added aux module
removed unused module
started refactoring code base