Altering file structure, fixing bugs