Fixed File Structure and repaired forge