Add folders to separate interface from implementation