Change folders structure and add support for 1.5.5.x