added Bond class and cleaned up files