code cleaning
more restructurez
match new naming conventions
boom aware! (no idea if it works)
added mockery
added mockery?