Add the forgotten config file
Prepare files to design change
Refactor design to be more clear and straight forward