Making everything more organized