-Constants now have their own package because i r lazy
-Changed names