Issue #4 - Fluent API
Reorganised files.