restructured packaging and building
restructured packaging and added IGNORE_CASE to tokens