Initial commit of reorganized classes