Split files, added buttons, fixed movement...