Cleaned up the directory issue