Renamed files to match with their module name