progress towards new BolBounce, reorganized some class and file names