Made some changes, moved files in order to get server working again