Renamed files and updated requirements and uses