added usage
re-organized app