Move stuff around for base app