Move assets and test to modules