Reordered build sources.
Renamed method in implementation.
Updated Application definition.