Cleaner modularization, change app name.