Move package structure to eclipse compatible layout.
Add file generated by AS.