refactored folder structure, to be more unique to tristans module