Minor changes. Files renames and moved around.