Cleaning up structure of files and adding interface