Moved and renamed some files according to plan. Finished linking the user menu.