Rearranged Project Lauyout to Mvn Standard