moved skeleton book files into content
fixed conflicts