MP3, module refactoring, better small factor support.