change structur for Grund build process