Added user data object. Moved some files around to be sure things stay organized.