renamed all files and cleaned some imports