renamed files, made more compact