added/refactored castling
Fixed filenames
Fixed names