Added constants class and restructured package format