Reorganized my app