Made it to version 1.0.0 and renamed the classes