fix separation into files
some fixes and updates
add missing schema