Little cleanup

Little bit of cleanup to directory structure.