Correcting paths and using dev-develop for ease/speed of dev.