Re-structure folders and files