Refactor Application + Skeleton Framework