moving stuff around in preparation for client-app setup (WIP)