Update application structure. Work through some pipe issues pertaining to project