Refactored packages, implemented Preprocessor, misc stubs