Organizing
Adding texture support