Changed folder names to be legit module names.