moved files to sub packages. added Functions to house test files