Initial import
Fix compilation, add missed files