Gave files more descriptive names, partially moved feeds to new class structure