TinyBLD - reorganize