splitted code, git update works, added build file