renamed files and removed underscore dependency