Move content in separate files and cleanup overview