Changing window
some fix
move modules
many changes