saner(?) naming/folder scheme