Finally organized my object files