fix app module
add new app module structure