reorganize so that models can import app