refactoring
updated build xml
updated composer json