Renamed classes to Daas from Baas and cleaned import stms