renames for inclusion of POS
Placeholder structure following @jnivre's suggestion
reorganize