Some more refactoring of ProjectFile to ProjectFileParser
Added eclipse annotation support for @NonNull etc.