File hierarchy change and class names change