Move to features directory for ease of running individual tests during active development