Add theme and move files to keep top level clean