New file structure, and fixed some old bugs...