Moved Content based things to own folder