Move files to root and simplify yml file