simplified server and removed some folder complexity