[Refactor] Minor modificatinos to file/folder organization