Added a few classes + organize