Cleanup structure and make composer compatible