Updated location of property files and fixed manifest classpath