Tidy up file layout
Users can now edit their account