1. Modified class file structure a bit