Renamed files and changed destination paths
Finished moving files to dist folder
Merge