Update file structure
Update to mouse handling