Moved Constants into proper folder