Files structure reorganization. Self contained style & data test added.