Reorganize some of the app