Refactored the code layout and added listings and users.