Refactory, separate functionality in artifacts
improve conf
improve config