Update application structure. Get initial package testing built out