Organized folders and added original interface