First version of new setup files
Almost at a working state after refactoring
Work in progress...