Restructured project
Modiefied test code a bit