added diary
added diary
moved files
removed unnecessary files
cleanup
merge