Renamed files and updated decorators section