File Refractor

Modified folder structure to make more sense