The use of enums instead of constant variables

Added enums, to change the use of constant variables. Basically they are the
same, but probably a little cleaner. Didn't really know where to put the enum
files though, since the constants were also in the root.