Added lib and interfaces packages