Changing package structure to com.clemble