Fixed gradle to work with AS 1.0
New layout