Modified build files to be more generic