moved home folder configs to a folder
fix conflicts