Repackaged classes into a more sensefull way