Updated composer dependencies
Moved some tests into subfolder
Removed un-needed files