Modify project for use MEDIA, and reorgonization