package refactored for composer'
added files from subfolder