fix folder structure and package name