readjusting paths and stuff ... still searching for a proper deployment structure