moved some content to separate files