New file structure, bug fixes.