Organize files into folder, fix up CSS a bit