Move Javax Mode in is own module