refactored project structure; improved parser processing