Moved to subfolder
Cleanup after discussions.