Revert "Moved Content area and imagefield"

This reverts commit 06d0fe7b25f3ceb4cd204a2146e015fb98a20c5c.