Restructured app slightly