changing package structure; build tools version update