Minor cleanup work (removing/renaming files, adding ignore rules, ...)