[Structure Change] Fixed package issues; moved preprocessor to be part of utils