remove duplicate filetree, improved serviceprovider and updated config structure