Refactored module wrapper, changed file structure, implementing browserr support