Some reafactoring

Fix file names, etc.