move to src/, small migration uncomment in Application