Moved files for better egg packaging

Change-Id: I0f8e13c4f9dae7f473e26c740e5deb88e669efee
Merge "Moved files for better egg packaging"