Refined the jar file structure to be used in OP