Moved modules into 'content' directory