Moved expression class and literal class to appropriate packages