get rid of file name classes for now
add service provider and manager class