fixed the library so the files are easy to sort
constants are moved to testvar