Renamed files and added loader