Removed Constants class due to Tyrael's comment on how it breaks java convention. Variables have been moved as needed.