Move to multi-filoe setup, much cleaner.