Added structure, compatible with Eclipse