Added user accounts and tidied up file structure