simplifying the structure of buildfile a little bit