Major refactoring. Made a beautiful new structure, especially when searching focus.