Controller spec changes; Structuring main