Move content to appropriate extension
Work on database sync