continued reorganizing classes
finished reorganizing packages
added shell classes to be filled in later
continued reorganization