Some classes re-organized. Basic classes not completed yet.