Commented HandleDisabling, and moved some files.