rewrote file structure entirely