commit layout & res
rename/classify packages