fix initial setup, mostly project reorganization