Major update (filenames, attempt at unification)