Amending the mess

More files to specify where exactly stuff goes for now some problems
with the functionality VS tries to be a PITA, nevertheless show must go
on.