Moved everything into resources