added modules and load in classes