Added new sources and reorganized classic dinamo