Fixed Memory Leaks / Reordered Files