refactor server location, added sample data