Moved some files around. Commented. Fixed reset.