Commit #9: More classes + Extractor with Rahmadi's editions + Fixing some bugs