MAJOR: rearranged build layout