reorganize specs, deleted unused specs and fixed controller ones as a partial safe