Edited: Project structure
Applied: Null Object pattern to project
Merge origin/enhance into enhance