Changed file structure once again to make sure we could come up with a proper Pod linking structure