Reorganziation

Moving around a few of the declaration as well as fixing the read-in of
user information.