Re-organize files to respect gitTio guidelines