Rearranging resources to make it work, better source JARs.