Remove dependencies to cards.dll
- clean up folder structure