Changed import paths to make it easier to build