README needs to be updated to reflect proper naming and the dead folders should probably be culled as well