Cleanup to streamline directory structure
cleanup