Fixed import paths for smooth compiling