Clean up and moving versions inside resources to make them work properly