back to static

renamed files to revert few commits, looks like there are still
conflicts