Made target separate module
Added types.h
Changes