Extracted file parsing
Remove debug code - Fix few issues

-More block changes
Build complete