restructure for rockspec