Add some things and make everything more organized