Changed some files around and got everything ready for production