Restructured app to be better packaged.