updated composer, refactoring of directory