Move main classes to Chart folder