cleanup files and standardise exports pattern