Cleaned up paths and fixed MADARA path bug.