Change file structure to match core and use include_path