Changed folders structure
added task