organized import modules. changed the order of some methods in MAID.