Simplify test suite
Remove unnecessary parts
Restructure asp package, using subdirectories