Reorganized project so its more theme oriented