Player Controls tweaking, folder tidy up