Moving over to a new war

Everything is put together in one war file