Merge pull request #30 from Infinity-3A3/Raed

Raed
Removed (_) classes