Add skin folder and refactor accordingly.