moved features out of subdirectories