moved members
Refactored away SourceFile since it didn't really do anything anymore