reorganized folder structure, renamed activity.