Improved file structure of source code
Moving columns works
filter and permutation state is saved