Moved items to folder

and updated the table code to match