Add some color
Fix folder structure issues