Some fixes and folder structure changes.