Renames files, added Rasp/Server spec