Updated to use recent docrine anotations
Removed dependant files should be loaded from composer