Re-arrange files and created new folder