Finally organize everything