Cleaned up the folder, implemented naming scheme and more useful interface function