Moved files around to work better in Eclipse