Changing directory names to better reflect the intention of the framework parts.