preparing for library extension: modified directory structure