Modify Buildfile for new package structure