Initial commit
Minor fixes (paths, ...)