refactoring

refactored the table contents and the folder contents