remove unused file
move modules to extra files