merge schedules properly
moved server app down one directory
added some tests