Restructuring project files more logically.

Also preparing for Fire simulation