fix model references
modularize helpers
remove old helper files