changing directory structure
fixing small bug with renaming files