refactoring everything into the static dir