Update composer and add main classes