Update structure. Add in startup commands and consolidate older files