Refactoring

 - Clean and reorganize imports
 - Move code for more consistency (bin stream location and PE specific code)