Cleaned up folder directory