Added terminal theme and reorganized base folder structure