Second commit with classes separated into files