Changed functionareas to features folder