Update to structure
Merge pull request #1 from tylerregas/fuel-3.1

Update to structure