Created New File Structure, updated all files to reflect that