Fluent specification types moved to 1 per file
Fluent specification classes ready