Began implementation of folders