Added file move and fixed folder get_content