Refactored app layout.

Refactored package to multiple modules. No functional changes.