restructure app
restructure, auth work