Restructure file layout and package names