same changes, commentaries. created package for activities and moved to