cleaned up doc blocks
renamed interfaces
renamed interfaces
renamed traits
psr-2 compliance