Added skeleton app and re-organized