Rename files, redo class names, some basic specs