File renaming

…and general cleanup