applied new theme and restructured -- still needs testing
cleaned up file dir