Moved and renamed files. Going back to dist