merge changes
re-organized app