Fixed variable declarations to point to correct directories