Added fonts and refactored redundant client folder