Minor restructuring and removing redundant files (from the old way we used to do extraction)