Change inherited class to be base rather than filesystem