Refactoring
Initial commit prototype configurator