Few corrections. moved constants declaration to the index file for easier access.
Revert "Few corrections. moved constants declaration to the index file for easier access."

This reverts commit 6245c9ee5dfb6ff33ce347c4a21e315d7b8cb541.
Few corrections. moved constants declaration to the index file for easier access.