Change Layout from package folder to file packages