Re-structured the files