refactored foldes and files