reshaped everything, removed analysis and note files