Refactored OS Features repo structure