rework app and dir structure to separate environments
fix underscored machine name
use machine name for package
start fixing tests