Fix undefined package
Cleanup app loader