organise into mvc directories
fix paths