Major breaking change: removed old now redundant files