Initial commit - module clean-up