Files moved and skeletons added