Same server strategy
Many changes
Add new files