Changed toolchain code and src tree structure