remove useless specs
adjust namespace