Re-organize some folders and write new shader